Repository: ambari Updated Branches: refs/heads/trunk c60fe07b6 -> 55b5111af
AMBARI-5161 Customize Services step load: change calls to asynchronous, second patch. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/55b5111a Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/55b5111a Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/55b5111a Branch: refs/heads/trunk Commit: 55b5111afa79d2954b750e62f33a49eaa6ac627a Parents: c60fe07 Author: atkach <[email protected]> Authored: Thu Mar 20 18:53:56 2014 +0200 Committer: atkach <[email protected]> Committed: Thu Mar 20 18:53:56 2014 +0200 ---------------------------------------------------------------------- ambari-web/app/controllers/main/service/info/configs.js | 5 ++++- ambari-web/app/utils/ajax.js | 7 ++++++- ambari-web/app/utils/config.js | 5 +++-- 3 files changed, 13 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/55b5111a/ambari-web/app/controllers/main/service/info/configs.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service/info/configs.js b/ambari-web/app/controllers/main/service/info/configs.js index 33abb98..8071f24 100644 --- a/ambari-web/app/controllers/main/service/info/configs.js +++ b/ambari-web/app/controllers/main/service/info/configs.js @@ -342,7 +342,10 @@ 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) || []; + var advancedConfigs = []; + App.config.loadAdvancedConfig(serviceName, function (properties) { + advancedConfigs.pushObjects(properties); + }, true); //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 http://git-wip-us.apache.org/repos/asf/ambari/blob/55b5111a/ambari-web/app/utils/ajax.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/ajax.js b/ambari-web/app/utils/ajax.js index 85695b8..30e6632 100644 --- a/ambari-web/app/utils/ajax.js +++ b/ambari-web/app/utils/ajax.js @@ -299,7 +299,12 @@ var urls = { 'config.advanced': { 'real': '{stack2VersionUrl}/stackServices/{serviceName}/configurations?fields=*', - 'mock': '/data/wizard/stack/hdp/version{stackVersion}/{serviceName}.json' + 'mock': '/data/wizard/stack/hdp/version{stackVersion}/{serviceName}.json', + 'format': function (data) { + return { + async: !data.sync + }; + } }, 'config.advanced.global': { 'real': '{stack2VersionUrl}/stackServices?fields=configurations/StackConfigurations/type', http://git-wip-us.apache.org/repos/asf/ambari/blob/55b5111a/ambari-web/app/utils/config.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/utils/config.js b/ambari-web/app/utils/config.js index e979d08..89a4a62 100644 --- a/ambari-web/app/utils/config.js +++ b/ambari-web/app/utils/config.js @@ -750,7 +750,7 @@ App.config = Em.Object.create({ * @param serviceName * @return {*} */ - loadAdvancedConfig: function (serviceName, callback) { + loadAdvancedConfig: function (serviceName, callback, sync) { App.ajax.send({ name: 'config.advanced', sender: this, @@ -758,7 +758,8 @@ App.config = Em.Object.create({ serviceName: serviceName, stack2VersionUrl: App.get('stack2VersionURL'), stackVersion: App.get('currentStackVersionNumber'), - callback: callback + callback: callback, + sync: sync }, success: 'loadAdvancedConfigSuccess', error: 'loadAdvancedConfigError'
