---
src/app/controllers/cloud_accounts_controller.rb | 2 +-
src/app/controllers/pool_controller.rb | 4 ++--
src/app/views/pool/accounts.html.erb | 4 ++--
src/app/views/pool/accounts_for_pool.html.erb | 2 +-
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/app/controllers/cloud_accounts_controller.rb
b/src/app/controllers/cloud_accounts_controller.rb
index 05e024e..1746662 100644
--- a/src/app/controllers/cloud_accounts_controller.rb
+++ b/src/app/controllers/cloud_accounts_controller.rb
@@ -32,7 +32,7 @@ class CloudAccountsController < ApplicationController
end
def new_from_pool
- @pool = Pool.find(params[:pool_id])
+ @pool = Pool.find(params[:id])
require_privilege(Privilege::ACCOUNT_ADD,@pool)
@cloud_account = CloudAccount.new
@providers = Provider.all
diff --git a/src/app/controllers/pool_controller.rb
b/src/app/controllers/pool_controller.rb
index cf751e0..9598714 100644
--- a/src/app/controllers/pool_controller.rb
+++ b/src/app/controllers/pool_controller.rb
@@ -90,7 +90,7 @@ class PoolController < ApplicationController
end
def accounts_for_pool
- @pool = Pool.find(params[:pool_id])
+ @pool = Pool.find(params[:id])
require_privilege(Privilege::ACCOUNT_VIEW,@pool)
@cloud_accounts = []
all_accounts = CloudAccount.list_for_user(@current_user,
Privilege::ACCOUNT_ADD)
@@ -100,7 +100,7 @@ class PoolController < ApplicationController
end
def add_account
- @pool = Pool.find(params[:pool])
+ @pool = Pool.find(params[:id])
@cloud_account = CloudAccount.find(params[:cloud_account])
require_privilege(Privilege::ACCOUNT_ADD,@pool)
require_privilege(Privilege::ACCOUNT_ADD,@cloud_account)
diff --git a/src/app/views/pool/accounts.html.erb
b/src/app/views/pool/accounts.html.erb
index 96c4e2d..135ddaf 100644
--- a/src/app/views/pool/accounts.html.erb
+++ b/src/app/views/pool/accounts.html.erb
@@ -26,5 +26,5 @@
</tbody>
</table>
<% end %>
-<%= link_to "View/Add Existing Cloud Accounts", {:controller => "pool",:action
=> "accounts_for_pool", :pool_id => @pool}, :class=>"actionlink" %>
-<%= link_to "Add a New Cloud Account", {:controller =>
"cloud_accounts",:action => "new_from_pool", :pool_id => @pool},
:class=>"actionlink" %><br/>
+<%= link_to "View/Add Existing Cloud Accounts", {:controller => "pool",:action
=> "accounts_for_pool", :id => @pool}, :class=>"actionlink" %>
+<%= link_to "Add a New Cloud Account", {:controller =>
"cloud_accounts",:action => "new_from_pool", :id => @pool},
:class=>"actionlink" %><br/>
diff --git a/src/app/views/pool/accounts_for_pool.html.erb
b/src/app/views/pool/accounts_for_pool.html.erb
index fc4e5cb..86beced 100644
--- a/src/app/views/pool/accounts_for_pool.html.erb
+++ b/src/app/views/pool/accounts_for_pool.html.erb
@@ -29,7 +29,7 @@
<tr>
<td><%= a.provider.name %></td>
<td><%= a.username %> <%= link_to "Add this account", {:controller=> "pool",
- :action => "add_account", :pool => @pool, :cloud_account => a}, :class =>
"actionlink" %></td>
+ :action => "add_account", :id => @pool, :cloud_account => a}, :class =>
"actionlink" %></td>
</tr>
<% } %>
</table>
--
1.6.2.5
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
