Repository: ambari Updated Branches: refs/heads/trunk 6d6812a2c -> a8b57314a
AMBARI-9177 Manual Steps should have "Do This Later" button. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a8b57314 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a8b57314 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a8b57314 Branch: refs/heads/trunk Commit: a8b57314a2183dcef315a4e98f12392845927cad Parents: 6d6812a Author: Andrii Tkach <[email protected]> Authored: Fri Jan 16 16:58:39 2015 +0200 Committer: Andrii Tkach <[email protected]> Committed: Fri Jan 16 17:34:53 2015 +0200 ---------------------------------------------------------------------- ambari-web/app/messages.js | 1 + .../templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs | 1 + ambari-web/app/views/main/admin/stack_upgrade/versions_view.js | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a8b57314/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index 31b164f..f7aa362 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -1325,6 +1325,7 @@ Em.I18n.translations = { 'admin.stackVersions.details.install.hosts.popup.title': "Install {0} version", + 'admin.stackUpgrade.doThisLater': "Do This Later", 'admin.stackUpgrade.downgrade.proceed': "Proceed with Downgrade", 'admin.stackUpgrade.downgrade.title': "Downgrade to {0}", 'admin.stackUpgrade.downgrade.body': "Are you sure you wish to abort the upgrade process and downgrade to {0}", http://git-wip-us.apache.org/repos/asf/ambari/blob/a8b57314/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs ---------------------------------------------------------------------- diff --git a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs index 4dd3322..5eec60c 100644 --- a/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs +++ b/ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs @@ -90,6 +90,7 @@ {{#if view.isDowngradeAvailable}} <button class="btn btn-danger" {{action confirmDowngrade target="controller"}}>{{t common.downgrade}}</button> {{/if}} + <button class="btn" {{action closeWizard target="view.parentView"}}>{{t admin.stackUpgrade.doThisLater}}</button> <button class="btn btn-success" {{bindAttr disabled="view.isManualProceedDisabled"}} {{action complete view.manualItem target="view"}}> {{t common.proceed}} </button> http://git-wip-us.apache.org/repos/asf/ambari/blob/a8b57314/ambari-web/app/views/main/admin/stack_upgrade/versions_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/admin/stack_upgrade/versions_view.js b/ambari-web/app/views/main/admin/stack_upgrade/versions_view.js index 35f6539..7d5205f 100644 --- a/ambari-web/app/views/main/admin/stack_upgrade/versions_view.js +++ b/ambari-web/app/views/main/admin/stack_upgrade/versions_view.js @@ -106,7 +106,6 @@ App.MainAdminStackVersionsView = Em.View.extend({ * @type {Array} */ versions: function () { - var currentVersion = this.get('controller.currentVersion'); var versions = this.get('repoVersions').map(function (version) { var versionFormatted = Em.Object.create({ id: version.get('id'), @@ -148,6 +147,7 @@ App.MainAdminStackVersionsView = Em.View.extend({ * @return {Array} */ filterBy: function (versions, filter) { + var currentVersion = this.get('controller.currentVersion'); if (filter && filter.get('value')) { return versions.filter(function (version) { if (version.get('status') === 'INSTALLED' && filter.get('value') === 'UPGRADE_READY') {
