AMBARI-14172 spark_thrift_cmd_opts fail to work. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/53ab860f Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/53ab860f Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/53ab860f Branch: refs/heads/trunk Commit: 53ab860fcb87814d283ec7cb4fb662f7b46ef873 Parents: da1c64c Author: aBabiichuk <ababiic...@cybervisiontech.com> Authored: Thu Dec 3 10:45:47 2015 +0200 Committer: aBabiichuk <ababiic...@cybervisiontech.com> Committed: Thu Dec 3 11:48:41 2015 +0200 ---------------------------------------------------------------------- ambari-web/app/controllers/main/service/info/configs.js | 8 ++------ ambari-web/app/models/stack_service.js | 6 ++++++ 2 files changed, 8 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/53ab860f/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 355ebd4..8b97b0d 100644 --- a/ambari-web/app/controllers/main/service/info/configs.js +++ b/ambari-web/app/controllers/main/service/info/configs.js @@ -486,13 +486,9 @@ App.MainServiceInfoConfigsController = Em.Controller.extend(App.ConfigsLoader, A onLoadOverrides: function (allConfigs) { this.get('servicesToLoad').forEach(function(serviceName) { var configGroups = serviceName == this.get('content.serviceName') ? this.get('configGroups') : this.get('dependentConfigGroups').filterProperty('serviceName', serviceName); - var serviceNames = [ serviceName ]; - if(serviceName === 'OOZIE') { - // For Oozie, also add ELService properties which are marked as FALCON properties. - serviceNames.push('FALCON'); - } + var configTypes = App.StackService.find(serviceName).get('configTypeList'); var configsByService = this.get('allConfigs').filter(function (c) { - return serviceNames.contains(c.get('serviceName')); + return configTypes.contains(App.config.getConfigTagFromFileName(c.get('filename'))); }); var serviceConfig = App.config.createServiceConfig(serviceName, configGroups, configsByService, configsByService.length); this.addHostNamesToConfigs(serviceConfig); http://git-wip-us.apache.org/repos/asf/ambari/blob/53ab860f/ambari-web/app/models/stack_service.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/stack_service.js b/ambari-web/app/models/stack_service.js index fb5ab16..5ab9e74 100644 --- a/ambari-web/app/models/stack_service.js +++ b/ambari-web/app/models/stack_service.js @@ -45,6 +45,12 @@ App.StackService = DS.Model.extend({ requiredServices: DS.attr('array'), /** + * @type {String[]} + */ + configTypeList: function() { + return Object.keys(this.get('configTypes') || {}); + }.property('configTypes'), + /** * contains array of serviceNames that have configs that * depends on configs from current service * @type {String[]}
