Repository: ambari Updated Branches: refs/heads/branch-2.5 e1ec5e95c -> 50d475457
AMBARI-19348 - Version number is incorrect when upgrade wizard is opened from Upgrade History (rzang) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/50d47545 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/50d47545 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/50d47545 Branch: refs/heads/branch-2.5 Commit: 50d475457b554fc7581d74eb5d2c5843ca5819a7 Parents: e1ec5e9 Author: Richard Zang <[email protected]> Authored: Wed Jan 4 12:58:38 2017 -0800 Committer: Richard Zang <[email protected]> Committed: Wed Jan 4 12:58:38 2017 -0800 ---------------------------------------------------------------------- .../app/views/main/admin/stack_upgrade/upgrade_history_view.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/50d47545/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 f7b7f0e..f6a419e 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,6 +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 type = this.get('upgradeMethods').findProperty('type', record.get('upgradeType')); var displayName = type ? type.get('displayName') : record.get('upgradeType'); @@ -298,7 +299,7 @@ App.MainAdminStackUpgradeHistoryView = App.TableView.extend(App.TableServerViewM App.ModalPopup.show({ classNames: ['wizard-modal-wrapper'], modalDialogClasses: ['modal-xlg'], - header: Em.I18n.t('admin.stackVersions.upgradeHistory.record.title').format(displayName, direction, record.get('fromVersion')), + header: Em.I18n.t('admin.stackVersions.upgradeHistory.record.title').format(displayName, direction, toVersion), bodyClass: App.MainAdminStackUpgradeHistoryDetailsView, primary: Em.I18n.t('common.dismiss'), secondary: null,
