minor fixes on client view

meanjs · May 10, 2014 · 4fd55e4 · 4fd55e4
1 parent c89c891
commit 4fd55e4
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/public/modules/core/services/menus.client.service.js b/public/modules/core/services/menus.client.service.js
@@ -82,7 +82,7 @@ angular.module('core').service('Menus', [
 			this.menus[menuId].items.push({
 				title: menuItemTitle,
 				link: menuItemURL,
-				class: menuClass || '',
+				mClass: menuClass || '',
 				uiRoute: menuItemUIRoute || ('/' + menuItemURL),
 				isPublic: isPublic || this.menus[menuId].isPublic,
 				roles: roles || this.defaultRoles,

diff --git a/public/modules/core/views/header.client.view.html b/public/modules/core/views/header.client.view.html
@@ -10,13 +10,13 @@
 	</div>
 	<nav class="collapse navbar-collapse" collapse="!isCollapsed" role="navigation">
 		<ul class="nav navbar-nav" data-ng-if="menu.shouldRender(authentication.user);">
-			<li data-ng-repeat="item in menu.items" data-ng-if="item.shouldRender(authentication.user);" ng-switch="item.class" class="{{item.class}}" ui-route="{{item.uiRoute}}" ng-class="{active: $uiRoute}">
+			<li data-ng-repeat="item in menu.items" data-ng-if="item.shouldRender(authentication.user);" ng-switch="item.mClass" class="{{item.mClass}}" ui-route="{{item.uiRoute}}" ng-class="{active: $uiRoute}">
 				<a ng-switch-when="dropdown" href="#" class="dropdown-toggle" data-toggle="dropdown">
 		                    {{item.title}}
 		                    <b class="caret"></b>
 		                </a>
 		                <ul ng-switch-when="dropdown" class="dropdown-menu"> 
-		                    <li data-ng-repeat="subitem in item.subitems">
+		                    <li data-ng-repeat="subitem in item.subitems"  data-ng-if="subitem.shouldRender(authentication.user);" ui-route="{{subitem.uiRoute}}" ng-class="{active: $uiRoute}">
 		                        <a href="/#!/{{subitem.link}}">{{subitem.title}}</a>
 		                    </li>                
 		                </ul>