Converge request user roles

We introduced feature miq_request_superadmin in f6c02e8 / ManageIQ#17444 The feature miq_request_approval already existed. Merging the 2 together. This fixes an inconsistency between API and UI The issue existed before this feature was introduced so this works with 17444 to fix the BZ ManageIQ#17444 https://bugzilla.redhat.com/show_bug.cgi?id=1608554
kbrock · Aug 14, 2018 · 98ee56e · 98ee56e
1 parent 3a5bba6
commit 98ee56e
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
   acts_as_tree
 

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
 
 # Catalog Items
 - :name: Catalogs Explorer

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