fix(): an admin can see all submenus even if the dev mode is on 'Deve…

…loper Portal Only' Fix gravitee-io/issues#2240
gravitee-io · May 15, 2019 · 305d153 · 305d153
1 parent 875406a
commit 305d153
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/index.route.ts b/src/index.route.ts
@@ -61,7 +61,7 @@ function routerConfig($stateProvider: StateProvider, $urlServiceProvider: UrlSer
                     let isMenuItem = routeMenuItem.data.menu.firstLevel;
                     let isMenuAllowed = !routeMenuItem.data.perms || !routeMenuItem.data.perms.only
                       || graviteeUser.allowedTo(routeMenuItem.data.perms.only);
-                    if (Constants.portal.devMode.enabled) {
+                    if (Constants.portal.devMode.enabled && !graviteeUser.isAdmin()) {
                       return isMenuItem && isMenuAllowed && routeMenuItem.data.devMode;
                     }  else {
                       return isMenuItem && isMenuAllowed;

diff --git a/src/management/management.run.ts b/src/management/management.run.ts
@@ -32,7 +32,7 @@ function runBlock($rootScope, $window, $http, $mdSidenav, $transitions, $state,
     let fromState = trans.from();
     let toState = trans.to();
 
-    let notEligibleForDevMode = Constants.portal.devMode.enabled && toState.data && !toState.data.devMode;
+    let notEligibleForDevMode = Constants.portal.devMode.enabled && toState.data && !toState.data.devMode && !UserService.currentUser.isAdmin();
     let notEligibleForUserCreation = !Constants.portal.userCreation.enabled && (fromState.name === 'registration' || fromState === 'confirm');
 
     if (notEligibleForDevMode || notEligibleForUserCreation) {