Merge pull request #1484 from chalettu/sui-permissions-cleanup

BZ# 1642623 - Fix permission related display issues (cherry picked from commit 04236db) Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1649419
ManageIQ · Nov 13, 2018 · dcec439 · dcec439
1 parent dc0fb73
commit dcec439
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/client/app/services/resource-details/resource-details.component.js b/client/app/services/resource-details/resource-details.component.js
@@ -328,7 +328,9 @@ function ComponentController ($state, $stateParams, VmsService, lodash, EventNot
       }
     ]
     snapshotOptionsActions.forEach((menuOption) => menuOption.permission ? snapshotOptionsMenu.actions.push(menuOption) : null)
-    vm.snapshotListActions = [snapshotOptionsMenu]
+    if (snapshotOptionsMenu.actions.length) {
+      vm.snapshotListActions = [snapshotOptionsMenu]
+    }
 
     return vm.snapshotListActions
   }

diff --git a/client/app/states/catalogs/explorer/explorer.state.js b/client/app/states/catalogs/explorer/explorer.state.js
@@ -14,7 +14,7 @@ function getStates (RBAC) {
       controllerAs: 'vm',
       title: __('Catalogs'),
       data: {
-        authorization: RBAC.hasAny(['svc_catalog_provision'])
+        authorization: RBAC.hasAny(['svc_catalog_provision', 'sui_svc_catalog_view'])
       }
     }
   }