Repository: ambari Updated Branches: refs/heads/trunk f4325f441 -> 9a22519f4
AMBARI-14365. HDFS Smart Configs: Inconsistent values on slider (onechiporenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9a22519f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9a22519f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9a22519f Branch: refs/heads/trunk Commit: 9a22519f4fb2bacc1614dd358ea5adc367f6095f Parents: f4325f4 Author: Oleg Nechiporenko <onechipore...@apache.org> Authored: Mon Dec 14 15:23:45 2015 +0200 Committer: Oleg Nechiporenko <onechipore...@apache.org> Committed: Mon Dec 14 15:23:45 2015 +0200 ---------------------------------------------------------------------- ambari-web/app/controllers/main/service/info/configs.js | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/9a22519f/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 1f7c46d..f031ae8 100644 --- a/ambari-web/app/controllers/main/service/info/configs.js +++ b/ambari-web/app/controllers/main/service/info/configs.js @@ -476,6 +476,7 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ConfigsLoader, A * @method onLoadOverrides */ onLoadOverrides: function (allConfigs) { + var self = this; this.get('servicesToLoad').forEach(function(serviceName) { var configGroups = serviceName == this.get('content.serviceName') ? this.get('configGroups') : this.get('dependentConfigGroups').filterProperty('serviceName', serviceName); var configTypes = App.StackService.find(serviceName).get('configTypeList'); @@ -490,13 +491,12 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ConfigsLoader, A var selectedService = this.get('stepConfigs').findProperty('serviceName', this.get('content.serviceName')); this.set('selectedService', selectedService); this.checkOverrideProperty(selectedService); - if (!App.Service.find().someProperty('serviceName', 'RANGER')) { - App.config.removeRangerConfigs(this.get('stepConfigs')); - } else { + if (App.Service.find().someProperty('serviceName', 'RANGER')) { this.setVisibilityForRangerProperties(selectedService); + } else { + App.config.removeRangerConfigs(this.get('stepConfigs')); } - this._onLoadComplete(); - this.getRecommendationsForDependencies(null, true, Em.K, this.get('selectedConfigGroup')); + this.getRecommendationsForDependencies(null, true, function () {self._onLoadComplete();}, this.get('selectedConfigGroup')); App.loadTimer.finish('Service Configs Page'); },
