You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2017/06/30 12:59:45 UTC
ambari git commit: AMBARI-21381 Various Places in the Web Client
Assume The Stack Name. (atkach)
Repository: ambari
Updated Branches:
refs/heads/branch-feature-AMBARI-21348 49773de19 -> ccdc57dbb
AMBARI-21381 Various Places in the Web Client Assume The Stack Name. (atkach)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/ccdc57db
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/ccdc57db
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/ccdc57db
Branch: refs/heads/branch-feature-AMBARI-21348
Commit: ccdc57dbbcbb5b0fdb8a15cdc708b1e7bc7be557
Parents: 49773de
Author: Andrii Tkach <at...@apache.org>
Authored: Fri Jun 30 15:18:30 2017 +0300
Committer: Andrii Tkach <at...@apache.org>
Committed: Fri Jun 30 15:18:48 2017 +0300
----------------------------------------------------------------------
.../models/stack_version/stack_upgrade_history.js | 17 ++++++++++++++++-
.../main/admin/stack_upgrade/upgrade_history.hbs | 4 ++--
.../admin/stack_upgrade/upgrade_history_view.js | 2 +-
3 files changed, 19 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/ccdc57db/ambari-web/app/models/stack_version/stack_upgrade_history.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/models/stack_version/stack_upgrade_history.js b/ambari-web/app/models/stack_version/stack_upgrade_history.js
index 9e0439c..589519d 100644
--- a/ambari-web/app/models/stack_version/stack_upgrade_history.js
+++ b/ambari-web/app/models/stack_version/stack_upgrade_history.js
@@ -31,7 +31,22 @@ App.StackUpgradeHistory = DS.Model.extend({
skipServiceCheckFailures: DS.attr('boolean'),
endTime: DS.attr('number'),
startTime: DS.attr('number'),
- createTime: DS.attr('number')
+ createTime: DS.attr('number'),
+
+ displayFromVersion: function() {
+ var stackName = App.RepositoryVersion.find()
+ .findProperty('repositoryVersion', this.get('fromVersion'))
+ .get('stackVersionType');
+ return stackName + '-' + this.get('fromVersion');
+ }.property('fromVersion'),
+
+ displayToVersion: function() {
+ var stackName = App.RepositoryVersion.find()
+ .findProperty('repositoryVersion', this.get('toVersion'))
+ .get('stackVersionType');
+ return stackName + '-' + this.get('toVersion');
+ }.property('toVersion')
+
});
App.StackUpgradeHistory.FIXTURES = [];
http://git-wip-us.apache.org/repos/asf/ambari/blob/ccdc57db/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history.hbs
----------------------------------------------------------------------
diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history.hbs
index 6d4a32d..ef03cec 100644
--- a/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history.hbs
+++ b/ambari-web/app/templates/main/admin/stack_upgrade/upgrade_history.hbs
@@ -67,10 +67,10 @@
<span>{{item.upgradeTypeLabel}}</span>
</td>
<td>
- <span>{{item.fromVersion}}</span>
+ <span>{{item.displayFromVersion}}</span>
</td>
<td>
- <span>{{item.toVersion}}</span>
+ <span>{{item.displayToVersion}}</span>
</td>
<td>
<span>{{item.startTimeLabel}}</span>
http://git-wip-us.apache.org/repos/asf/ambari/blob/ccdc57db/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js
index 3dfb4c1..cedfc14 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_history_view.js
@@ -290,7 +290,7 @@ App.MainAdminStackUpgradeHistoryView = App.TableView.extend(App.TableServerViewM
showUpgradeHistoryRecord: function (event) {
var record = event.context;
var direction = App.format.normalizeName(record.get('direction'));
- var toVersion = record.get('toVersion');
+ var toVersion = record.get('displayToVersion');
var type = this.get('upgradeMethods').findProperty('type', record.get('upgradeType'));
var displayName = type ? type.get('displayName') : record.get('upgradeType');