Updated Branches: refs/heads/trunk 70fe2e3f0 -> 7a6e05ec4
AMBARI-3855. YARN Client restart indicator not shown on host configs page. (akovalenko) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/7a6e05ec Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/7a6e05ec Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/7a6e05ec Branch: refs/heads/trunk Commit: 7a6e05ec4925e238e41ede5d1cb71a41adc32ac7 Parents: 70fe2e3 Author: Aleksandr Kovalenko <oleksandr.kovale...@ukr.net> Authored: Fri Nov 22 15:19:31 2013 +0200 Committer: Aleksandr Kovalenko <oleksandr.kovale...@ukr.net> Committed: Fri Nov 22 15:19:31 2013 +0200 ---------------------------------------------------------------------- ambari-web/app/controllers/main/host/details.js | 3 +++ ambari-web/app/templates/main/host/summary.hbs | 6 +----- ambari-web/app/views/main/host/summary.js | 4 ++-- 3 files changed, 6 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/7a6e05ec/ambari-web/app/controllers/main/host/details.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/host/details.js b/ambari-web/app/controllers/main/host/details.js index 708b1dc..06b0334 100644 --- a/ambari-web/app/controllers/main/host/details.js +++ b/ambari-web/app/controllers/main/host/details.js @@ -991,6 +991,9 @@ App.MainHostDetailsController = Em.Controller.extend({ onPrimary: function () { var hostComponents = this.content.get('content.hostComponents').filterProperty('staleConfigs', true); hostComponents.forEach(function(item){ + if (item.get('isClient') && commandName === 'start_component') { + return false; + } var componentName = item.get('componentName'); var hostName = item.get('host.hostName'); App.ajax.send({ http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/7a6e05ec/ambari-web/app/templates/main/host/summary.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/host/summary.hbs b/ambari-web/app/templates/main/host/summary.hbs index 7350b31..29fb794 100644 --- a/ambari-web/app/templates/main/host/summary.hbs +++ b/ambari-web/app/templates/main/host/summary.hbs @@ -154,11 +154,7 @@ <div class="span3 align-right">{{t common.clients}} /</div> <div class="span7"> {{#each component in view.clients}} - {{#if component.isLast}} - {{component.displayName}} - {{else}} - {{component.displayName}}, - {{/if}} + {{component.displayName}}{{#if component.staleConfigs}} <i class="text-warning icon-refresh"></i>{{/if}}{{#unless component.isLast}},{{/unless}} {{/each}} </div> {{/if}} http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/7a6e05ec/ambari-web/app/views/main/host/summary.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/host/summary.js b/ambari-web/app/views/main/host/summary.js index 29c656a..ea7bee8 100644 --- a/ambari-web/app/views/main/host/summary.js +++ b/ambari-web/app/views/main/host/summary.js @@ -35,8 +35,8 @@ App.MainHostSummaryView = Em.View.extend({ }, needToRestartComponentsCount: function() { - return this.get('sortedComponents').filterProperty('staleConfigs', true).length; - }.property('sortedComponents.@each.staleConfigs'), + return this.get('content.hostComponents').filterProperty('staleConfigs', true).length; + }.property('content.hostComponents.@each.staleConfigs'), stopComponentsIsDisabled: function () { var staleComponents = this.get('sortedComponents').filterProperty('staleConfigs', true);
