Merge pull request #17849 from kbrock/bz_1608554

Converge request user roles to match API and UI
ManageIQ · Aug 16, 2018 · 31599e6 · 31599e6
2 parents 880ef45 + 9a63e12
commit 31599e6
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/app/models/miq_product_feature.rb b/app/models/miq_product_feature.rb
@@ -1,7 +1,7 @@
 class MiqProductFeature < ApplicationRecord
   SUPER_ADMIN_FEATURE = "everything".freeze
   REPORT_ADMIN_FEATURE  = "miq_report_superadmin".freeze
-  REQUEST_ADMIN_FEATURE = "miq_request_superadmin".freeze
+  REQUEST_ADMIN_FEATURE = "miq_request_approval".freeze
   ADMIN_FEATURE = REPORT_ADMIN_FEATURE
   TENANT_ADMIN_FEATURE = "rbac_tenant".freeze
 

diff --git a/db/fixtures/miq_product_features.yml b/db/fixtures/miq_product_features.yml
@@ -180,10 +180,6 @@
       :description: Edit a Request
       :feature_type: admin
       :identifier: miq_request_edit
-  - :name: Request Admin
-    :description: Edit other user's requests
-    :feature_type: admin
-    :identifier: miq_request_superadmin
 
 # MiqRequest under Automation/Automate tab for Automate Requests
 - :name: Requests

diff --git a/db/fixtures/miq_user_roles.yml b/db/fixtures/miq_user_roles.yml
@@ -66,7 +66,7 @@
   - miq_report
   - miq_report_superadmin
   - miq_request
-  - miq_request_superadmin
+  - miq_request_approval
   - miq_template
   - orchestration_stack
   - physical_rack