Arthur Bogaart pushed to branch feature/cmng-psp1-CHANNELMGR-637 at cms-community / hippo-addon-channel-manager
Commits: 5752e79e by Arthur Bogaart at 2016-05-20T15:43:51+02:00 CHANNELMGR-637 Reload sitemenu from server on load - - - - - 2 changed files: - frontend-ng/src/angularjs/api/siteMenu.service.js - frontend-ng/src/angularjs/channel/menu/editor.controller.js Changes: ===================================== frontend-ng/src/angularjs/api/siteMenu.service.js ===================================== --- a/frontend-ng/src/angularjs/api/siteMenu.service.js +++ b/frontend-ng/src/angularjs/api/siteMenu.service.js @@ -28,7 +28,10 @@ export class SiteMenuService { this.loadMenuPromise = null; } - getMenu(menuId) { + getMenu(menuId, forceUpdate) { + if (forceUpdate) { + this.loadMenuPromise = null; + } return this._loadMenu(menuId); } @@ -36,15 +39,15 @@ export class SiteMenuService { return this._loadMenu(menuId).then((menu) => this._findMenuItem(menu.items, menuItemId)); } - _loadMenu(menuUuid) { + _loadMenu(menuId) { if (this.loadMenuPromise === null) { - this.loadMenuPromise = this.HstService.doGet(menuUuid) + this.loadMenuPromise = this.HstService.doGet(menuId) .then((response) => { if (response.data.items && !angular.equals(this.menu.items, response.data.items)) { // if response items are different, copy response items into menu angular.copy(response.data, this.menu); // collapse all nodes with childNodes - this.addCollapsedProperties(this.menu.items, true); + this._addCollapsedProperties(this.menu.items, true); } this.menu.id = response.data.id || null; return this.menu; @@ -53,12 +56,12 @@ export class SiteMenuService { return this.loadMenuPromise; } - addCollapsedProperties(items, collapsed) { + _addCollapsedProperties(items, collapsed) { if (angular.isArray(items)) { items.forEach((item) => { if (item.items && item.items.length > 0) { item.collapsed = collapsed; - this.addCollapsedProperties(item.items, collapsed); + this._addCollapsedProperties(item.items, collapsed); } }); } ===================================== frontend-ng/src/angularjs/channel/menu/editor.controller.js ===================================== --- a/frontend-ng/src/angularjs/channel/menu/editor.controller.js +++ b/frontend-ng/src/angularjs/channel/menu/editor.controller.js @@ -21,7 +21,7 @@ export class MenuEditorCtrl { this.SiteMenuService = SiteMenuService; this.FormStateService = FormStateService; - SiteMenuService.getMenu(this.menuUuid) + SiteMenuService.getMenu(this.menuUuid, true) .then((menu) => { this.items = menu.items; this.selectedItem = this.items.length > 0 ? this.items[0] : undefined; View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/commit/5752e79e9724fb63fa78ba50a6b9b29683dbb0c7
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn