From: mtaylor <[email protected]>
---
src/app/controllers/pool_controller.rb | 4 +---
src/app/views/pool/show.html.erb | 2 +-
src/config/routes.rb | 8 ++++++--
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/app/controllers/pool_controller.rb
b/src/app/controllers/pool_controller.rb
index 1fabc2f..cf751e0 100644
--- a/src/app/controllers/pool_controller.rb
+++ b/src/app/controllers/pool_controller.rb
@@ -84,9 +84,8 @@ class PoolController < ApplicationController
def delete
end
-
def images
- @pool = Pool.find(params[:pool])
+ @pool = Pool.find(params[:id])
require_privilege(Privilege::POOL_VIEW, @pool)
end
@@ -113,5 +112,4 @@ class PoolController < ApplicationController
redirect_to :action => 'show', :id => @pool.id
end
-
end
diff --git a/src/app/views/pool/show.html.erb b/src/app/views/pool/show.html.erb
index acc5f1a..015f13b 100644
--- a/src/app/views/pool/show.html.erb
+++ b/src/app/views/pool/show.html.erb
@@ -39,5 +39,5 @@
<%= link_to "Back end Accounts", {:action => "accounts", :id => @pool.id},
:class=>"actionlink"%>
<%= link_to "User access", {:controller => "permissions", :action => "list",
:pool_id => @pool.id}, :class=>"actionlink" if has_view_perms? %>
<%= link_to "Hardware Profiles", {:action => "hardware_profiles", :id =>
@pool.id}, :class=>"actionlink"%>
-<%=link_to "View Images", {:controller => "pool", :action => "images", :pool
=> @pool}, :class => "actionlink" %>
+<%=link_to "View Images", {:controller => "pool", :action => "images", :id =>
@pool}, :class => "actionlink" %>
<%= link_to "Realms", {:action => "realms", :id => @pool.id},
:class=>"actionlink"%>
diff --git a/src/config/routes.rb b/src/config/routes.rb
index 38e9ce4..4a304ca 100644
--- a/src/config/routes.rb
+++ b/src/config/routes.rb
@@ -31,6 +31,10 @@ 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.
+
+
+ map.resources :pool
+
map.connect '', :controller => 'provider'
map.login 'login', :controller => "user_sessions", :action => "new"
@@ -40,11 +44,11 @@ ActionController::Routing::Routes.draw do |map|
map.resource :account, :controller => "users"
map.resources :users
map.root :login
+
# Temporarily disable this route, provider stuff is not restful yet.
# Will be re-enabled in upcoming patch
# map.resources :provider
-
# Allow downloading Web Service WSDL as a file with an extension
# instead of a file named 'wsdl'
map.connect ':controller/service.wsdl', :action => 'wsdl'
@@ -52,4 +56,4 @@ ActionController::Routing::Routes.draw do |map|
# Install the default route as the lowest priority.
map.connect ':controller/:action/:id.:format'
map.connect ':controller/:action/:id'
-end
+end
\ No newline at end of file
--
1.6.6.1
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
