cleanup authenticated and added check for enabled moduler

EthanGuo · May 7, 2014 · d7034dd · d7034dd
1 parent 60569f3
commit d7034dd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/server/controllers/index.js b/server/controllers/index.js
@@ -14,7 +14,7 @@ exports.render = function(req, res) {
             angularDependencies: mean.modules[name].angularDependencies
         });
     }
-
+    
     // Send some basic starting info to the view
     res.render('index', {
         user: req.user ? {
@@ -24,8 +24,8 @@ exports.render = function(req, res) {
             roles: req.user.roles
         } : {},
         modules: modules,
-        enabledAdmin: function(name) {
-            return (req.user.roles && req.user.roles.indexOf('admin') && mean.enabled(name));
+        adminEnabled: function() {
+            return (req.user && (req.user.roles.indexOf('admin') != -1) && mean.enabled('mean-admin'));
         }
 
     });

diff --git a/server/views/layouts/default.html b/server/views/layouts/default.html
@@ -4,7 +4,7 @@
 
 <body>
     <div class="navbar navbar-inverse navbar-fixed-top" data-ng-include="'/public/system/views/header.html'" data-role="navigation"></div>
-    {% if enabledAdmin('mean-admin')  %}
+    {% if adminEnabled() %}
     <section class="admin-menu">
         <div data-ng-include="'/mean-admin/views/index.html'"></div>
     </section>