diff --git a/backend/src/appenlight/static/js/appenlight.js b/backend/src/appenlight/static/js/appenlight.js index 0fc383c..65d6714 100644 --- a/backend/src/appenlight/static/js/appenlight.js +++ b/backend/src/appenlight/static/js/appenlight.js @@ -3831,12 +3831,26 @@ function kickstartAE(initialUserData) { "
  • Groups
  • \n" + "
  • Create group
  • \n" + " \n" + + "\n" + + " \n" + + "\n" + " \n" + "
    \n" + "
    Resources
    \n" + " \n" + + "\n" + + " \n" + + "\n" + "
    \n" + "\n" + "
    \n" + @@ -3846,6 +3860,13 @@ function kickstartAE(initialUserData) { "
  • System
  • \n" + "
  • Partition Management
  • \n" + " \n" + + "\n" + + " \n" + + "\n" + "
    \n" + " \n" + "\n" + @@ -8025,10 +8046,11 @@ angular.module('appenlight.components.adminView', []) controller: AdminViewController }); -AdminViewController.$inject = ['$state']; +AdminViewController.$inject = ['$state', 'AeConfig']; -function AdminViewController($state) { +function AdminViewController($state, AeConfig) { this.$state = $state; + this.AeConfig = AeConfig; console.info('AdminViewController'); } @@ -10965,7 +10987,11 @@ aeconfig.factory('AeConfig', function () { menuUserSettingsItems: [], menuNotificationsItems: [] }; - obj.adminNav = {}; + obj.adminNav = { + menuUsersItems: [], + menuResourcesItems: [], + menuSystemItems: [] + }; obj.ws_url = window.AE.ws_url; obj.urls = window.AE.urls; // set keys on values because we wont be able to retrieve them everywhere @@ -13140,14 +13166,7 @@ angular.module('appenlight.services.stateHolder', []).factory('stateHolder', self.inclusions[name] = []; } self.inclusions[name].push(inclusion); - }, - addnavigation: function (name, inclusion) { - var self = this; - if (self.inclusions.hasOwnProperty(name) === false) { - self.inclusions[name] = []; - } - self.inclusions[name].push(inclusion); - }, + } }; var stateHolder = { diff --git a/frontend/src/components/views/admin-view/admin-view.html b/frontend/src/components/views/admin-view/admin-view.html index bcf4df0..3f31905 100644 --- a/frontend/src/components/views/admin-view/admin-view.html +++ b/frontend/src/components/views/admin-view/admin-view.html @@ -8,12 +8,26 @@
  • Groups
  • Create group
  • + + +
    Resources
    + + +
    @@ -23,6 +37,13 @@
  • System
  • Partition Management
  • + + +
    diff --git a/frontend/src/components/views/admin-view/admin-view.js b/frontend/src/components/views/admin-view/admin-view.js index 30d2e6b..7bd8d01 100644 --- a/frontend/src/components/views/admin-view/admin-view.js +++ b/frontend/src/components/views/admin-view/admin-view.js @@ -23,9 +23,10 @@ angular.module('appenlight.components.adminView', []) controller: AdminViewController }); -AdminViewController.$inject = ['$state']; +AdminViewController.$inject = ['$state', 'AeConfig']; -function AdminViewController($state) { +function AdminViewController($state, AeConfig) { this.$state = $state; + this.AeConfig = AeConfig; console.info('AdminViewController'); } diff --git a/frontend/src/config.js b/frontend/src/config.js index c8827eb..4edca36 100644 --- a/frontend/src/config.js +++ b/frontend/src/config.js @@ -35,7 +35,11 @@ aeconfig.factory('AeConfig', function () { menuUserSettingsItems: [], menuNotificationsItems: [] }; - obj.adminNav = {}; + obj.adminNav = { + menuUsersItems: [], + menuResourcesItems: [], + menuSystemItems: [] + }; obj.ws_url = window.AE.ws_url; obj.urls = window.AE.urls; // set keys on values because we wont be able to retrieve them everywhere