Use role_allows for request admins

ManageIQ · Jun 1, 2018 · f929c18 · f929c18
1 parent d564e2f
commit f929c18
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/app/controllers/api/automation_requests_controller.rb b/app/controllers/api/automation_requests_controller.rb
@@ -43,12 +43,12 @@ def deny_resource(type, id, data)
 
     def find_automation_requests(id)
       klass = collection_class(:requests)
-      return klass.find(id) if User.current_user.request_admin_user?
+      return klass.find(id) if User.current_user.role_allows?(:identifier => "miq_request_superadmin")
       klass.find_by!(:requester => User.current_user, :id => id)
     end
 
     def automation_requests_search_conditions
-      return {} if User.current_user.request_admin_user?
+      return {} if User.current_user.role_allows?(:identifier => "miq_request_superadmin")
       {:requester => User.current_user}
     end
   end

diff --git a/app/controllers/api/provision_requests_controller.rb b/app/controllers/api/provision_requests_controller.rb
@@ -46,12 +46,12 @@ def approve_resource(type, id, data)
 
     def find_provision_requests(id)
       klass = collection_class(:requests)
-      return klass.find(id) if User.current_user.request_admin_user?
+      return klass.find(id) if User.current_user.role_allows?(:identifier => "miq_report_superadmin")
       klass.find_by!(:requester => User.current_user, :id => id)
     end
 
     def provision_requests_search_conditions
-      return {} if User.current_user.request_admin_user?
+      return {} if User.current_user.role_allows?(:identifier => "miq_report_superadmin")
       {:requester => User.current_user}
     end
   end

diff --git a/app/controllers/api/requests_controller.rb b/app/controllers/api/requests_controller.rb
@@ -57,12 +57,12 @@ def deny_resource(type, id, data)
 
     def find_requests(id)
       klass = collection_class(:requests)
-      return klass.find(id) if User.current_user.request_admin_user?
+      return klass.find(id) if User.current_user.role_allows?(:identifier => "miq_report_superadmin")
       klass.find_by!(:requester => User.current_user, :id => id)
     end
 
     def requests_search_conditions
-      return {} if User.current_user.request_admin_user?
+      return {} if User.current_user.role_allows?(:identifier => "miq_report_superadmin")
       {:requester => User.current_user}
     end
 

diff --git a/app/controllers/api/service_requests_controller.rb b/app/controllers/api/service_requests_controller.rb
@@ -35,12 +35,12 @@ def edit_resource(type, id, data)
 
     def find_service_requests(id)
       klass = collection_class(:service_requests)
-      return klass.find(id) if User.current_user.request_admin_user?
+      return klass.find(id) if User.current_user.role_allows?(:identifier => "miq_report_superadmin")
       klass.find_by!(:requester => User.current_user, :id => id)
     end
 
     def service_requests_search_conditions
-      return {} if User.current_user.request_admin_user?
+      return {} if User.current_user.role_allows?(:identifier => "miq_report_superadmin")
       {:requester => User.current_user}
     end