From: mtaylor <[email protected]>
---
src/app/controllers/provider_controller.rb | 4 ++--
src/app/views/provider/show.html.erb | 7 ++-----
src/config/routes.rb | 23 +++++++++++++++++++----
3 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/src/app/controllers/provider_controller.rb
b/src/app/controllers/provider_controller.rb
index 0252a26..ef38809 100644
--- a/src/app/controllers/provider_controller.rb
+++ b/src/app/controllers/provider_controller.rb
@@ -42,8 +42,8 @@ class ProviderController < ApplicationController
end
def destroy
- if request.post?
- p =Provider.find(params[:provider][:id])
+ if request.delete?
+ p = Provider.find(params[:id])
require_privilege(Privilege::PROVIDER_MODIFY, p)
p.destroy
end
diff --git a/src/app/views/provider/show.html.erb
b/src/app/views/provider/show.html.erb
index 2ec5f62..a4e37d0 100644
--- a/src/app/views/provider/show.html.erb
+++ b/src/app/views/provider/show.html.erb
@@ -21,8 +21,5 @@
<%= link_to "Add a pool", {:controller => "portal_pool", :action => "new",
:provider => @provider}, :class => "actionlink" %>
<%= link_to "Realms", {:action => "realms", :id => @provider.id},
:class=>"actionlink"%>
<%= link_to "Accounts", {:action => "accounts", :id => @provider.id},
:class=>"actionlink"%>
-<%= link_to "User access", {:controller => "permissions", :action => "list",
:provider_id => @provider.id}, :class=>"actionlink" if has_view_perms? %>
-<% form_tag :action => 'destroy' do %>
- <%=hidden_field :provider, :id %>
- <%= submit_tag "Delete Provider", :class => "submit_link" %>
-<% end %>
+<%= link_to "User access", {:controller => "permissions", :action => "list",
:provider_id => @provider.id}, :id => "provider_permissions", :class=>
"actionlink" if has_view_perms? %>
+<%= link_to "Delete Provider", @provider, :method => :delete, :class =>
"actionlink" %>
diff --git a/src/config/routes.rb b/src/config/routes.rb
index 053d61f..ad128f0 100644
--- a/src/config/routes.rb
+++ b/src/config/routes.rb
@@ -31,18 +31,33 @@ ActionController::Routing::Routes.draw do |map|
# You can have the root of your site routed by hooking up ''
# -- just remember to delete public/index.html.
+
+ # Provider Mappings
+ map.resources :provider
+ map.connect '', :controller => 'provider'
+ map.realms_provider '/provider/realms/:id', :controller => 'provider',
:action => 'realms'
+ map.accounts_provider '/provider/accounts/:id', :controller => 'provider',
:action => 'accounts'
-
+ # Permissions Mappings
+ map.list_permissions '/permissions/list/:provider_id', :controller =>
'permissions', :action => 'list'
+
+ # Portal Pool Mappings
map.resources :portal_pool
-
- map.connect '', :controller => 'provider'
+ # Cloud Account Mappings
+ map.resources :cloud_account
+
+ # User Sessions Mappings
+ map.resource :user_session
map.login 'login', :controller => "user_sessions", :action => "new"
map.logout 'logout', :controller => "user_sessions", :action => "destroy"
- map.resource :user_session
+
+ # User Mappings
map.register 'register', :controller => 'users', :action => 'new'
map.resource :account, :controller => "users"
map.resources :users
+
+ # Root
map.root :login
# Temporarily disable this route, provider stuff is not restful yet.
--
1.6.6.1
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
