You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by ab...@apache.org on 2013/12/02 13:37:19 UTC
git commit: AMBARI-3941 Restart indicator UI should not show up in
Host Details page. (ababiichuk)
Updated Branches:
refs/heads/branch-1.4.2 9baff7bf0 -> d480a9a79
AMBARI-3941 Restart indicator UI should not show up in Host Details page. (ababiichuk)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d480a9a7
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d480a9a7
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d480a9a7
Branch: refs/heads/branch-1.4.2
Commit: d480a9a79fd3d9f5cffd3f10f1e0c27f6f254a0f
Parents: 9baff7b
Author: aBabiichuk <ab...@cybervisiontech.com>
Authored: Mon Dec 2 14:21:13 2013 +0200
Committer: aBabiichuk <ab...@cybervisiontech.com>
Committed: Mon Dec 2 14:21:13 2013 +0200
----------------------------------------------------------------------
ambari-web/app/messages.js | 1 -
ambari-web/app/templates/main/host/summary.hbs | 14 -----------
ambari-web/app/utils/ajax.js | 1 +
ambari-web/app/views/main/host/summary.js | 26 ---------------------
4 files changed, 1 insertion(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/d480a9a7/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index 7b0cb54..2c92d02 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1322,7 +1322,6 @@ Em.I18n.translations = {
'hosts.host.summary.addComponent':'Add Component',
'hosts.host.details.hostActions':'Host Actions',
- 'hosts.host.details.needToRestart':'Host needs {0} components restarted',
'hosts.host.details.needToRestart.button':'Restart components',
'hosts.host.details.needToRestart.stopButton':'Stop Components',
'hosts.host.details.needToRestart.startButton':'Start Components',
http://git-wip-us.apache.org/repos/asf/ambari/blob/d480a9a7/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..aa0947e 100644
--- a/ambari-web/app/templates/main/host/summary.hbs
+++ b/ambari-web/app/templates/main/host/summary.hbs
@@ -27,20 +27,6 @@
<div class="host-components">
{{#if view.sortedComponents.length}}
- {{#if view.needToRestartComponentsCount}}
- <div class="alert alert-warning clearfix">
- <i class="icon-refresh"></i> {{view.needToRestartMessage}}
- <br/>
- <button {{bindAttr class=":btn :restart-components :pull-left view.stopComponentsIsDisabled::btn-danger view.stopComponentsIsDisabled:disabled" }} {{action restartComponents view.isStopCommand target="controller"}}>
- {{t hosts.host.details.needToRestart.stopButton}}
- </button>
- <span class="restart-components pull-left"> </span>
- <button {{bindAttr class=":btn :restart-components :pull-left view.startComponentsIsDisabled::btn-success view.startComponentsIsDisabled:disabled" }} {{action restartComponents target="controller"}}>
- {{t hosts.host.details.needToRestart.startButton}}
- </button>
- </div>
- {{/if}}
-
{{#each component in view.sortedComponents}}
<div class="row-fluid">
{{#view view.ComponentView contentBinding="component" decommissionDataNodeHostNamesBinding="view.decommissionDataNodeHostNames"}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/d480a9a7/ambari-web/app/utils/ajax.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/utils/ajax.js b/ambari-web/app/utils/ajax.js
index 1603627..c105adc 100644
--- a/ambari-web/app/utils/ajax.js
+++ b/ambari-web/app/utils/ajax.js
@@ -304,6 +304,7 @@ var urls = {
async: false
}
}
+ },
'service.metrics.flume.channel_fill_percent': {
'real': '/clusters/{clusterName}/services/FLUME/components/FLUME_SERVER?fields=host_components/metrics/flume/flume/CHANNEL/*/ChannelFillPercentage[{fromSeconds},{toSeconds},{stepSeconds}]',
'mock': '/data/services/metrics/flume/channelFillPct.json',
http://git-wip-us.apache.org/repos/asf/ambari/blob/d480a9a7/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..6e7adbe 100644
--- a/ambari-web/app/views/main/host/summary.js
+++ b/ambari-web/app/views/main/host/summary.js
@@ -34,32 +34,6 @@ App.MainHostSummaryView = Em.View.extend({
window.open(gangliaMobileUrl);
},
- needToRestartComponentsCount: function() {
- return this.get('sortedComponents').filterProperty('staleConfigs', true).length;
- }.property('sortedComponents.@each.staleConfigs'),
-
- stopComponentsIsDisabled: function () {
- var staleComponents = this.get('sortedComponents').filterProperty('staleConfigs', true);
- if(!staleComponents.findProperty('workStatus','STARTED')){
- return true;
- } else {
- return false;
- }
- }.property('sortedComponents.@each.workStatus'),
-
- startComponentsIsDisabled:function () {
- var staleComponents = this.get('sortedComponents').filterProperty('staleConfigs', true);
- if(!staleComponents.findProperty('workStatus','INSTALLED')){
- return true;
- } else {
- return false;
- }
- }.property('sortedComponents.@each.workStatus'),
-
- needToRestartMessage: function() {
- return Em.I18n.t('hosts.host.details.needToRestart').format(this.get('needToRestartComponentsCount'));
- }.property('needToRestartComponentsCount'),
-
/**
* @type: [{String}]
*/