Merge "Closes-Bug: #1549690 Merege all ajax calls issued for getting …

…web-server configuration into single call. Currently, different calls are issued for getting web-server configuration like one call for getting the disabled features and one for getting the feature-pkgs enabled."
Juniper · Feb 26, 2016 · 84576eb · 84576eb
2 parents cf182b1 + dccad21
commit 84576eb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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) {