Repository: ambari Updated Branches: refs/heads/trunk 10a960f70 -> 350257637
AMBARI-21982 Configs in Hosts page shows 'switch to <conf_group>' even though <conf_group> is already selected. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/35025763 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/35025763 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/35025763 Branch: refs/heads/trunk Commit: 350257637d21189f0ba0810e609578ca81a43122 Parents: 10a960f Author: Andrii Tkach <atk...@apache.org> Authored: Mon Sep 18 18:05:45 2017 +0300 Committer: Andrii Tkach <atk...@apache.org> Committed: Mon Sep 18 18:15:24 2017 +0300 ---------------------------------------------------------------------- .../main/service/manage_config_groups_controller.js | 6 ++++-- ambari-web/app/templates/common/configs/overriddenProperty.hbs | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/35025763/ambari-web/app/controllers/main/service/manage_config_groups_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/service/manage_config_groups_controller.js b/ambari-web/app/controllers/main/service/manage_config_groups_controller.js index 7e4b090..a2f957e 100644 --- a/ambari-web/app/controllers/main/service/manage_config_groups_controller.js +++ b/ambari-web/app/controllers/main/service/manage_config_groups_controller.js @@ -381,6 +381,8 @@ App.ManageConfigGroupsController = Em.Controller.extend(App.ConfigOverridable, { */ getNewlyAddedHostComponentsMap: function () { var newlyAddedHostComponentsMap = {}; + var masters = App.router.get('addServiceController.content.masterComponentHosts') || []; + var slaves = App.router.get('addServiceController.content.slaveComponentHosts') || []; var clients = App.router.get('addServiceController.content.clients').filterProperty('isInstalled', false).map(function (component) { return Em.Object.create({ componentName: component.component_name, @@ -388,7 +390,7 @@ App.ManageConfigGroupsController = Em.Controller.extend(App.ConfigOverridable, { }); }); - App.router.get('addServiceController.content.masterComponentHosts').forEach(function (component) { + masters.forEach(function (component) { if (!component.isInstalled) { if (!newlyAddedHostComponentsMap[component.hostName]) { newlyAddedHostComponentsMap[component.hostName] = []; @@ -400,7 +402,7 @@ App.ManageConfigGroupsController = Em.Controller.extend(App.ConfigOverridable, { } }); - App.router.get('addServiceController.content.slaveComponentHosts').forEach(function (component) { + slaves.forEach(function (component) { component.hosts.forEach(function (host) { if (!host.isInstalled) { if (!newlyAddedHostComponentsMap[host.hostName]) { http://git-wip-us.apache.org/repos/asf/ambari/blob/35025763/ambari-web/app/templates/common/configs/overriddenProperty.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/common/configs/overriddenProperty.hbs b/ambari-web/app/templates/common/configs/overriddenProperty.hbs index 3c34d70..b258137 100644 --- a/ambari-web/app/templates/common/configs/overriddenProperty.hbs +++ b/ambari-web/app/templates/common/configs/overriddenProperty.hbs @@ -54,7 +54,9 @@ <span class="help-block validation-block pull-right" {{QAAttr "validation-block"}}>{{view.overriddenSCP.errorMessage}}</span> {{/if}} {{else}} - <a class="action">{{view.overriddenSCP.group.switchGroupTextShort}}</a> + {{#unless controller.isHostsConfigsPage}} + <a class="action">{{view.overriddenSCP.group.switchGroupTextShort}}</a> + {{/unless}} {{/if}} {{/if}} </div>
