Repository: ambari Updated Branches: refs/heads/branch-2.1 834430050 -> ed629c6d2
AMBARI-13186 Config groups not displayed after stack advisor is induced with errors. (ababiichuk) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ed629c6d Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ed629c6d Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ed629c6d Branch: refs/heads/branch-2.1 Commit: ed629c6d2271cd8f6f9acc86c8f5a82280fcbe73 Parents: 8344300 Author: aBabiichuk <ababiic...@cybervisiontech.com> Authored: Tue Sep 22 17:22:53 2015 +0300 Committer: aBabiichuk <ababiic...@cybervisiontech.com> Committed: Tue Sep 22 17:27:15 2015 +0300 ---------------------------------------------------------------------- ambari-web/app/mixins/common/configs/enhanced_configs.js | 1 - ambari-web/app/mixins/main/service/groups_mapping.js | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/ed629c6d/ambari-web/app/mixins/common/configs/enhanced_configs.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mixins/common/configs/enhanced_configs.js b/ambari-web/app/mixins/common/configs/enhanced_configs.js index a5cc065..621088a 100644 --- a/ambari-web/app/mixins/common/configs/enhanced_configs.js +++ b/ambari-web/app/mixins/common/configs/enhanced_configs.js @@ -348,7 +348,6 @@ App.EnhancedConfigsMixin = Em.Mixin.create({ dependenciesSuccess: function (data, opt, params) { this._saveRecommendedValues(data, params.initial, params.dataToSend.changed_configurations, params.selectedConfigGroup); this.set("recommendationsConfigs", Em.get(data.resources[0] , "recommendations.blueprint.configurations")); - this.set('configGroupsAreLoaded', true); if (!params.initial) { this.updateDependentConfigs(); } http://git-wip-us.apache.org/repos/asf/ambari/blob/ed629c6d/ambari-web/app/mixins/main/service/groups_mapping.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/mixins/main/service/groups_mapping.js b/ambari-web/app/mixins/main/service/groups_mapping.js index 4da472f..bca4e20 100644 --- a/ambari-web/app/mixins/main/service/groups_mapping.js +++ b/ambari-web/app/mixins/main/service/groups_mapping.js @@ -34,6 +34,7 @@ App.GroupsMappingMixin = Em.Mixin.create({ loadConfigGroups: function (serviceNames) { var dfd = $.Deferred(); if (!serviceNames || serviceNames.length === 0) { + this.set('configGroupsAreLoaded', true); dfd.resolve(); } else { App.ajax.send({ @@ -58,6 +59,7 @@ App.GroupsMappingMixin = Em.Mixin.create({ */ saveConfigGroupsToModel: function (data, opt, params) { App.configGroupsMapper.map(data, false, params.serviceNames.split(',')); + this.set('configGroupsAreLoaded', true); params.dfd.resolve(); }
