Revert "AMBARI-5161 Customize Services step load: change calls to asynchronous, second patch. (atkach)"

This reverts commit 55b5111afa79d2954b750e62f33a49eaa6ac627a.

ambari-web/app/controllers/main/service/info/configs.js

@@ -342,10 +342,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
     //STEP 2: Create an array of objects defining tag names to be polled and new tag names to be set after submit
     this.setServiceConfigTags(this.loadedClusterSiteToTagMap);
     //STEP 3: Load advanced configs from server
-    var advancedConfigs = [];
-    App.config.loadAdvancedConfig(serviceName, function (properties) {
-      advancedConfigs.pushObjects(properties);
-    }, true);
+    var advancedConfigs = App.config.loadAdvancedConfig(serviceName) || [];
     //STEP 4: Load on-site config by service from server
     var configGroups = App.router.get('configurationController').getConfigsByTags(this.get('serviceConfigTags'));
     //STEP 5: Merge global and on-site configs with pre-defined

ambari-web/app/utils/ajax.js

@@ -299,12 +299,7 @@ var urls = {
 
   'config.advanced': {
     'real': '{stack2VersionUrl}/stackServices/{serviceName}/configurations?fields=*',
-    'mock': '/data/wizard/stack/hdp/version{stackVersion}/{serviceName}.json',
-    'format': function (data) {
-      return {
-        async: !data.sync
-      };
-    }
+    'mock': '/data/wizard/stack/hdp/version{stackVersion}/{serviceName}.json'
   },
   'config.advanced.global': {
     'real': '{stack2VersionUrl}/stackServices?fields=configurations/StackConfigurations/type',

ambari-web/app/utils/config.js

@@ -750,7 +750,7 @@ App.config = Em.Object.create({
    * @param serviceName
    * @return {*}
    */
-  loadAdvancedConfig: function (serviceName, callback, sync) {
+  loadAdvancedConfig: function (serviceName, callback) {
     App.ajax.send({
       name: 'config.advanced',
       sender: this,
@@ -758,8 +758,7 @@ App.config = Em.Object.create({
         serviceName: serviceName,
         stack2VersionUrl: App.get('stack2VersionURL'),
         stackVersion: App.get('currentStackVersionNumber'),
-        callback: callback,
-        sync: sync
+        callback: callback
       },
       success: 'loadAdvancedConfigSuccess',
       error: 'loadAdvancedConfigError'