Repository: ambari Updated Branches: refs/heads/trunk 8a01bebe4 -> b695dbea9
AMBARI-11893. Manual steps on Downgrade UI shows a button that says "Pause Upgrade". (Di Li via jaimin) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b695dbea Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b695dbea Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b695dbea Branch: refs/heads/trunk Commit: b695dbea92edf6cdb186d21c011fa09a0007a196 Parents: 8a01beb Author: Jaimin Jetly <[email protected]> Authored: Mon Jun 15 11:25:00 2015 -0700 Committer: Jaimin Jetly <[email protected]> Committed: Mon Jun 15 11:25:00 2015 -0700 ---------------------------------------------------------------------- ambari-web/app/messages.js | 1 + .../main/admin/stack_upgrade/stack_upgrade_wizard.hbs | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/b695dbea/ambari-web/app/messages.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/messages.js b/ambari-web/app/messages.js index 33b5cb8..40e76d5 100644 --- a/ambari-web/app/messages.js +++ b/ambari-web/app/messages.js @@ -1451,6 +1451,7 @@ Em.I18n.translations = { 'admin.stackUpgrade.finalize.message.testServices': "You are strongly recommended to test these services before finalizing upgrade.", 'admin.stackUpgrade.doThisLater': "Do This Later", 'admin.stackUpgrade.pauseUpgrade': "Pause Upgrade", + 'admin.stackUpgrade.pauseDowngrade': "Pause Downgrade", 'admin.stackUpgrade.downgrade.proceed': "Proceed with Downgrade", 'admin.stackUpgrade.downgrade.body': "Are you sure you wish to abort the upgrade process and downgrade to <b>{0}</b>?", 'admin.stackUpgrade.upgrade.confirm.body': "You are about to perform an upgrade to {0}.", http://git-wip-us.apache.org/repos/asf/ambari/blob/b695dbea/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 75d97e1..c6f38b5 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 @@ -134,7 +134,11 @@ {{#if view.isDowngradeAvailable}} <button class="btn btn-danger" {{bindAttr disabled="controller.requestInProgress"}} {{action confirmDowngrade view.manualItem target="controller"}}>{{t common.downgrade}}</button> {{/if}} - <button class="btn" {{action closeWizard target="view.parentView"}}>{{t admin.stackUpgrade.pauseUpgrade}}</button> + {{#if isDowngrade}} + <button class="btn" {{action closeWizard target="view.parentView"}}>{{t admin.stackUpgrade.pauseDowngrade}}</button> + {{else}} + <button class="btn" {{action closeWizard target="view.parentView"}}>{{t admin.stackUpgrade.pauseUpgrade}}</button> + {{/if}} <button class="btn btn-success" {{bindAttr disabled="view.isManualProceedDisabled"}} {{action complete view.manualItem target="view"}}> {{t common.proceed}} </button>
