From: Jan Provaznik <[email protected]>
Till now provider new form was displayed after successful delete.
---
src/app/controllers/provider_controller.rb | 2 --
src/app/views/provider/_providers.haml | 7 +++++++
src/app/views/provider/index.haml | 1 +
src/app/views/provider/index.html.erb | 1 -
src/app/views/settings/index.haml | 9 +--------
5 files changed, 9 insertions(+), 11 deletions(-)
create mode 100644 src/app/views/provider/_providers.haml
create mode 100644 src/app/views/provider/index.haml
delete mode 100644 src/app/views/provider/index.html.erb
diff --git a/src/app/controllers/provider_controller.rb
b/src/app/controllers/provider_controller.rb
index 8ead3f3..eaf1d53 100644
--- a/src/app/controllers/provider_controller.rb
+++ b/src/app/controllers/provider_controller.rb
@@ -23,8 +23,6 @@ class ProviderController < ApplicationController
before_filter :require_user
def index
- # FIXME: this should be something other than 'new' here
- render :action => 'new'
end
def show
diff --git a/src/app/views/provider/_providers.haml
b/src/app/views/provider/_providers.haml
new file mode 100644
index 0000000..4b8008e
--- /dev/null
+++ b/src/app/views/provider/_providers.haml
@@ -0,0 +1,7 @@
+%h2 Providers
+%ul#providers
+ - @providers.each do |provider|
+ %li
+ = link_to provider.name, {:controller => "provider", :action => "show",
:id => provider }, :class => "providername"
+- if
BasePermissionObject.general_permission_scope.has_privilege(@current_user,
Privilege::PROVIDER_MODIFY)
+ = link_to "Add a provider", {:controller => "provider", :action => "new"},
:class => "actionlink"
diff --git a/src/app/views/provider/index.haml
b/src/app/views/provider/index.haml
new file mode 100644
index 0000000..9823f42
--- /dev/null
+++ b/src/app/views/provider/index.haml
@@ -0,0 +1 @@
+= render :partial => 'providers'
diff --git a/src/app/views/provider/index.html.erb
b/src/app/views/provider/index.html.erb
deleted file mode 100644
index 786950e..0000000
--- a/src/app/views/provider/index.html.erb
+++ /dev/null
@@ -1 +0,0 @@
-<%= render :partial => 'form' %>
diff --git a/src/app/views/settings/index.haml
b/src/app/views/settings/index.haml
index e7030de..b7a708c 100644
--- a/src/app/views/settings/index.haml
+++ b/src/app/views/settings/index.haml
@@ -1,9 +1,2 @@
%h1 Settings
-
-%h2 Providers
-%ul#providers
- - @providers.each do |provider|
- %li
- = link_to provider.name, {:controller => "provider", :action => "show",
:id => provider }, :class => "providername"
-- if
BasePermissionObject.general_permission_scope.has_privilege(@current_user,
Privilege::PROVIDER_MODIFY)
- = link_to "Add a provider", {:controller => "provider", :action => "new"},
:class => "actionlink"
+= render :partial => 'provider/providers'
--
1.7.0.1
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
