You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by xi...@apache.org on 2014/07/16 02:35:45 UTC
git commit: AMBARI-6481. Ambari showing pending upgrade instead of
pending upgrade not finalized.(xiwang)
Repository: ambari
Updated Branches:
refs/heads/trunk 8e2993515 -> 9075909f0
AMBARI-6481. Ambari showing pending upgrade instead of pending upgrade not finalized.(xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/9075909f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/9075909f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/9075909f
Branch: refs/heads/trunk
Commit: 9075909f06874726f2c99d77a8845aaacf2707a6
Parents: 8e29935
Author: Xi Wang <xi...@apache.org>
Authored: Mon Jul 14 18:15:43 2014 -0700
Committer: Xi Wang <xi...@apache.org>
Committed: Tue Jul 15 17:34:28 2014 -0700
----------------------------------------------------------------------
ambari-web/app/messages.js | 2 +-
ambari-web/app/styles/application.less | 11 ++---------
ambari-web/app/templates/main/service/services/hdfs.hbs | 2 +-
ambari-web/app/views/main/service/services/hdfs.js | 8 +++++++-
4 files changed, 11 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/9075909f/ambari-web/app/messages.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js
index a5d1a81..75dfa29 100644
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@ -1106,7 +1106,7 @@ Em.I18n.translations = {
'services.service.summary.nameNode.active':'Active NameNode',
'services.service.summary.nameNode.standby':'Standby NameNode',
'services.service.summary.pendingUpgradeStatus':'Upgrade Status',
- 'services.service.summary.pendingUpgradeStatus.pending':'Pending upgrade',
+ 'services.service.summary.pendingUpgradeStatus.notFinalized':'Upgrade not finalized',
'services.service.summary.pendingUpgradeStatus.notPending':'No pending upgrade',
'services.service.summary.safeModeStatus':'Safe Mode Status',
'services.service.summary.safeModeStatus.inSafeMode':'In safe mode',
http://git-wip-us.apache.org/repos/asf/ambari/blob/9075909f/ambari-web/app/styles/application.less
----------------------------------------------------------------------
diff --git a/ambari-web/app/styles/application.less b/ambari-web/app/styles/application.less
index 1945480..604f884 100644
--- a/ambari-web/app/styles/application.less
+++ b/ambari-web/app/styles/application.less
@@ -2339,26 +2339,19 @@ width:100%;
border-collapse: collapse;
color: #666;
font-size: 13px;
-
.icon-medkit {
color: black!important;
}
-
td.summary-label {
width: 180px;
text-align: right;
}
-
-/*
- td {
- border-top: 1px solid #eee;
+ .upgrade-status-warning {
+ color: @health-status-orange;
}
-*/
-
tr td:first-child {
text-align: right;
}
-
a {
text-decoration: underline;
&:hover {
http://git-wip-us.apache.org/repos/asf/ambari/blob/9075909f/ambari-web/app/templates/main/service/services/hdfs.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/service/services/hdfs.hbs b/ambari-web/app/templates/main/service/services/hdfs.hbs
index 2ffa076..91a0edc 100644
--- a/ambari-web/app/templates/main/service/services/hdfs.hbs
+++ b/ambari-web/app/templates/main/service/services/hdfs.hbs
@@ -97,7 +97,7 @@
<tr>
<td>{{t services.service.summary.pendingUpgradeStatus}}</td>
<td>
- {{view.upgradeStatus}}
+ <span {{bindAttr class="view.isUpgradeStatusWarning:upgrade-status-warning"}}>{{view.upgradeStatus}}</span>
</td>
</tr>
<!-- Safe Mode Status -->
http://git-wip-us.apache.org/repos/asf/ambari/blob/9075909f/ambari-web/app/views/main/service/services/hdfs.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/service/services/hdfs.js b/ambari-web/app/views/main/service/services/hdfs.js
index b9afb58..b320658 100644
--- a/ambari-web/app/views/main/service/services/hdfs.js
+++ b/ambari-web/app/views/main/service/services/hdfs.js
@@ -190,9 +190,15 @@ App.MainDashboardServiceHdfsView = App.MainDashboardServiceView.extend({
if (upgradeStatus) {
return Em.I18n.t('services.service.summary.pendingUpgradeStatus.notPending');
} else if (healthStatus == 'green') {
- return Em.I18n.t('services.service.summary.pendingUpgradeStatus.pending');
+ return Em.I18n.t('services.service.summary.pendingUpgradeStatus.notFinalized');
} else {
return Em.I18n.t("services.service.summary.notAvailable");
}
+ }.property('service.upgradeStatus', 'service.healthStatus'),
+ isUpgradeStatusWarning: function () {
+ var upgradeStatus = this.get('service.upgradeStatus');
+ var healthStatus = this.get('service.healthStatus');
+ return !upgradeStatus && healthStatus == 'green';
}.property('service.upgradeStatus', 'service.healthStatus')
+
});