Repository: ambari Updated Branches: refs/heads/branch-2.6 99484dccd -> 0f47bb5ce
AMBARI-21745 UI: remove code which adds ELExtension properties while adding Falcon. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/0f47bb5c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/0f47bb5c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/0f47bb5c Branch: refs/heads/branch-2.6 Commit: 0f47bb5ce08c7960ee5ad28d741241813fe6d711 Parents: 99484dc Author: Andrii Tkach <[email protected]> Authored: Thu Aug 17 19:03:43 2017 +0300 Committer: Andrii Tkach <[email protected]> Committed: Fri Aug 18 12:12:42 2017 +0300 ---------------------------------------------------------------------- ambari-web/app/controllers/main/service/item.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/0f47bb5c/ambari-web/app/controllers/main/service/item.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service/item.js b/ambari-web/app/controllers/main/service/item.js index 09c7a9c..ecdf3f3 100644 --- a/ambari-web/app/controllers/main/service/item.js +++ b/ambari-web/app/controllers/main/service/item.js @@ -148,6 +148,10 @@ App.MainServiceItemController = Em.Controller.extend(App.SupportClientConfigsDow App.StackService.find(this.get('content.serviceName')).get('dependentServiceNames') : []; }.property('content.serviceName', 'App.router.clusterController.isConfigsPropertiesLoaded'), + configDependentServiceNames: function() { + return this.get('dependentServiceNames').concat(App.StackService.find(this.get('content.serviceName')).get('requiredServices')) + }.property('dependentServiceNames'), + /** * List of service names that could be deleted * Common case when there is only current service should be removed @@ -171,7 +175,7 @@ App.MainServiceItemController = Em.Controller.extend(App.SupportClientConfigsDow * @type {String[]} */ sitesToLoad: function() { - var services = this.get('dependentServiceNames'), configTypeList = []; + var services = this.get('configDependentServiceNames'), configTypeList = []; if (services.length) { configTypeList = App.StackService.find().filter(function(s) { return services.contains(s.get('serviceName')); @@ -225,7 +229,7 @@ App.MainServiceItemController = Em.Controller.extend(App.SupportClientConfigsDow allConfigs = allConfigs.concat(App.config.getConfigsFromJSON(site, true)); }); - self.get('dependentServiceNames').forEach(function(serviceName) { + self.get('configDependentServiceNames').forEach(function(serviceName) { var configTypes = App.StackService.find(serviceName).get('configTypeList'); var configsByService = allConfigs.filter(function (c) { return configTypes.contains(App.config.getConfigTagFromFileName(c.get('filename')));
