diff --git a/src/serverroot/utils/common.utils.js b/src/serverroot/utils/common.utils.js index 8819482b1..5d64cdf62 100644 --- a/src/serverroot/utils/common.utils.js +++ b/src/serverroot/utils/common.utils.js @@ -1387,6 +1387,9 @@ function getWebServerInfo (req, res, appData) serverObj['configServer']['ip'] = getValueByJsonPath(config, 'cnfg;server_ip', null); + + serverObj['disabledFeatures'] = getValueByJsonPath(config,'features;disabled',[]); + serverObj['featurePkgsInfo'] = getValueByJsonPath(config,'featurePkg',[]); var pkgList = process.mainModule.exports['pkgList']; var pkgLen = pkgList.length; var activePkgs = []; diff --git a/webroot/js/handlers/MenuHandler.js b/webroot/js/handlers/MenuHandler.js index 1e59ea601..f66c6ea33 100644 --- a/webroot/js/handlers/MenuHandler.js +++ b/webroot/js/handlers/MenuHandler.js @@ -34,18 +34,15 @@ define(['underscore'], function (_) { } } $.get('/' + mFileName+ '?built_at=' + built_at, function (xml) { - $.get('/api/admin/webconfig/features/disabled?built_at=' + built_at, function (disabledFeatures) { - $.get('/api/admin/webconfig/featurePkg/webController?built_at=' + built_at, function (featurePkgsInfo) { menuObj = $.xml2json(xml); + var disabledFeatures = globalObj['webServerInfo']['disabledFeatures']; + var featurePkgsInfo = globalObj['webServerInfo']['featurePkgsInfo']; processXMLJSON(menuObj, disabledFeatures); - globalObj['webServerInfo']['disabledFeatures'] = ifNull(disabledFeatures, []); var menuShortcuts = contrail.getTemplate4Id('menu-shortcuts')(menuHandler.filterMenuItems(menuObj['items']['item'], 'menushortcut', featurePkgsInfo)); $("#sidebar-shortcuts").html(menuShortcuts); ['items']['item'] = menuHandler.filterMenuItems(menuObj['items']['item']); initMenuDefObj.resolve(); }); - }) - }); //Add an event listener for clicking on menu items $('#menu').on('click', 'ul > li > a', function (e) {