Set admin groups list, fix georchestra#366

tonio · Aug 29, 2016 · 373607a · 373607a
1 parent 071d111
commit 373607a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/ldapadmin/src/main/webapp/console/app/components/groups/groups.es6 b/ldapadmin/src/main/webapp/console/app/components/groups/groups.es6
@@ -77,7 +77,9 @@ class GroupsController {
       active.cn.substr(0, active.cn.lastIndexOf('_')) == group.cn // Group prefix of active
     );
 
-    return result && this.adminList.every(g => g.cn != group.cn)
+    return result && this.adminList.concat(
+      [ {cn: 'MOD'}, {cn: 'GN'} ] // Avoid empty parents
+    ).every(g => g.cn != group.cn)
   }
 
   isExpanded(group, active) {

diff --git a/ldapadmin/src/main/webapp/console/app/services/groups.es6 b/ldapadmin/src/main/webapp/console/app/services/groups.es6
@@ -11,13 +11,14 @@ angular.module('admin_console')
   var admin_groups = [
     'ADMINISTRATOR',
     'PENDING',
-    'GN_ADMIN',
-    'GN_EDITOR',
-    'GN_REVIEWER',
     'MOD_ANALYTICS',
     'MOD_EXTRACTORAPP',
     'MOD_LDAPADMIN',
+    'GN_ADMIN',
+    'GN_EDITOR',
+    'GN_REVIEWER',
     'USER'
+    'TEMPORARY'
   ]
   return () => admin_groups
 }]).factory('groupAdminFilter', [ 'groupAdminList', (groupAdminList)  =>