Merge branch 'pr/116' into 0.3.2

edwardysun · Jul 19, 2014 · 9fb6e41 · 9fb6e41
2 parents f59befc + 6730ae3
commit 9fb6e41
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/public/modules/core/services/menus.client.service.js b/public/modules/core/services/menus.client.service.js
@@ -85,7 +85,7 @@ angular.module('core').service('Menus', [
 				menuItemType: menuItemType || 'item',
 				menuItemClass: menuItemType,
 				uiRoute: menuItemUIRoute || ('/' + menuItemURL),
-				isPublic: isPublic || this.menus[menuId].isPublic,
+				isPublic: isPublic === null && this.menus[menuId].isPublic || isPublic,
 				roles: roles || this.defaultRoles,
 				items: [],
 				shouldRender: shouldRender
@@ -108,7 +108,7 @@ angular.module('core').service('Menus', [
 						title: menuItemTitle,
 						link: menuItemURL,
 						uiRoute: menuItemUIRoute || ('/' + menuItemURL),
-						isPublic: isPublic || this.menus[menuId].isPublic,
+						isPublic: isPublic === null && this.menus[menuId].isPublic || isPublic,
 						roles: roles || this.defaultRoles,
 						shouldRender: shouldRender
 					});