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/9a08bce3 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9a08bce3 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9a08bce3 Branch: refs/heads/branch-feature-logsearch-ui Commit: 9a08bce35082f7e9ada7022c9e6bbf1b769348c4 Parents: b428fb9 Author: Andrii Tkach <atk...@apache.org> Authored: Thu Aug 17 19:03:43 2017 +0300 Committer: Andrii Tkach <atk...@apache.org> Committed: Fri Aug 18 12:14:53 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/9a08bce3/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 197eb8e..224f83b 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')));
