Code from mleanos

meanjs · Aug 14, 2015 · 9fc6091 · 9fc6091
1 parent e68b422
commit 9fc6091
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/modules/articles/client/config/articles.client.config.js b/modules/articles/client/config/articles.client.config.js
@@ -7,7 +7,8 @@ angular.module('articles').run(['Menus',
     Menus.addMenuItem('topbar', {
       title: 'Articles',
       state: 'articles',
-      type: 'dropdown'
+      type: 'dropdown',
+      roles: ['*']
     });
 
     // Add the dropdown list item

diff --git a/modules/chat/client/config/chat.client.config.js b/modules/chat/client/config/chat.client.config.js
@@ -6,8 +6,7 @@ angular.module('chat').run(['Menus',
     // Set top bar menu items
     Menus.addMenuItem('topbar', {
       title: 'Chat',
-      state: 'chat',
-      roles: ['user']
+      state: 'chat'
     });
   }
 ]);
diff --git a/modules/core/client/services/menus.client.service.js b/modules/core/client/services/menus.client.service.js
@@ -4,7 +4,7 @@
 angular.module('core').service('Menus', [
   function () {
     // Define a set of default roles
-    this.defaultRoles = ['*'];
+    this.defaultRoles = ['user', 'admin'];
 
     // Define the menus object
     this.menus = {};
@@ -87,7 +87,7 @@ angular.module('core').service('Menus', [
         state: options.state || '',
         type: options.type || 'item',
         class: options.class,
-        roles: ((options.roles === null || typeof options.roles === 'undefined') ? this.menus[menuId].roles : options.roles),
+        roles: ((options.roles === null || typeof options.roles === 'undefined') ? this.defaultRoles : options.roles),
         position: options.position || 0,
         items: [],
         shouldRender: shouldRender
@@ -164,6 +164,8 @@ angular.module('core').service('Menus', [
     };
 
     //Adding the topbar menu
-    this.addMenu('topbar');
+    this.addMenu('topbar', {
+      roles: ['*']
+    });
   }
 ]);