From: Tomas Sedovic <[email protected]>
Related to the upcoming UI redesign, this provides additional data that will be
used in the new/modified views.
---
src/app/controllers/instance_controller.rb | 1 +
src/app/controllers/pool_controller.rb | 1 +
src/app/controllers/settings_controller.rb | 1 +
src/app/controllers/templates_controller.rb | 2 ++
4 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/src/app/controllers/instance_controller.rb
b/src/app/controllers/instance_controller.rb
index e2a1eaf..dcf0fa2 100644
--- a/src/app/controllers/instance_controller.rb
+++ b/src/app/controllers/instance_controller.rb
@@ -35,6 +35,7 @@ class InstanceController < ApplicationController
# go to condor and sync the database to the real instance states
condormatic_instances_sync_states
+ @pools = Pool.list_for_user(@current_user, Privilege::INSTANCE_MODIFY)
@order_dir = params[:order_dir] == 'desc' ? 'desc' : 'asc'
@order = params[:order] || 'name'
@instances = Instance.search_filter(params[:search],
Instance::SEARCHABLE_COLUMNS).paginate(
diff --git a/src/app/controllers/pool_controller.rb
b/src/app/controllers/pool_controller.rb
index 41c5369..4def55b 100644
--- a/src/app/controllers/pool_controller.rb
+++ b/src/app/controllers/pool_controller.rb
@@ -70,6 +70,7 @@ class PoolController < ApplicationController
def new
require_privilege(Privilege::POOL_MODIFY)
+ @pools = Pool.list_for_user(@current_user, Privilege::POOL_MODIFY)
@pool = Pool.new
end
diff --git a/src/app/controllers/settings_controller.rb
b/src/app/controllers/settings_controller.rb
index 84f80be..32ef39f 100644
--- a/src/app/controllers/settings_controller.rb
+++ b/src/app/controllers/settings_controller.rb
@@ -28,6 +28,7 @@ class SettingsController < ApplicationController
def self_service
@providers = Provider.list_for_user(@current_user,
Privilege::PROVIDER_VIEW)
+ @pools = Pool.list_for_user(@current_user, Privilege::POOL_VIEW)
end
end
diff --git a/src/app/controllers/templates_controller.rb
b/src/app/controllers/templates_controller.rb
index c701486..d56e32a 100644
--- a/src/app/controllers/templates_controller.rb
+++ b/src/app/controllers/templates_controller.rb
@@ -9,6 +9,8 @@ class TemplatesController < ApplicationController
end
def index
+ @repository_manager = RepositoryManager.new
+ @pools = Pool.list_for_user(@current_user, Privilege::POOL_VIEW)
end
def new
--
1.7.2.2
_______________________________________________
deltacloud-devel mailing list
[email protected]
https://fedorahosted.org/mailman/listinfo/deltacloud-devel
