Repository: ambari Updated Branches: refs/heads/trunk 1bf80a6df -> 8dc133502
AMBARI-13868. Not possible to pause upgrade if Finalize Upgrade Pre-Check failed due MM host.(xiwang) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8dc13350 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8dc13350 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8dc13350 Branch: refs/heads/trunk Commit: 8dc133502028dd4f402c1a4516a8325849c1d696 Parents: 1bf80a6 Author: Xi Wang <[email protected]> Authored: Thu Nov 12 14:45:22 2015 -0800 Committer: Xi Wang <[email protected]> Committed: Thu Nov 12 14:54:28 2015 -0800 ---------------------------------------------------------------------- ambari-web/app/models/upgrade_entity.js | 2 +- .../templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/8dc13350/ambari-web/app/models/upgrade_entity.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/upgrade_entity.js b/ambari-web/app/models/upgrade_entity.js index 1733154..ab9806a 100644 --- a/ambari-web/app/models/upgrade_entity.js +++ b/ambari-web/app/models/upgrade_entity.js @@ -87,7 +87,7 @@ App.upgradeEntity = Em.Object.extend({ return 'SUSPENDED'; } if (this.get('type') === 'GROUP') { - return !this.get('isActive') && this.get('hasExpandableItems') ? 'SUBITEM_FAILED' : this.get('status'); + return !this.get('isActive') && this.get('hasExpandableItems') ? 'SUBITEM_FAILED' : this.get('display_status') || this.get('status'); } }.property('isExpandableGroup', 'App.router.mainAdminStackAndUpgradeController.isSuspended') }); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/ambari/blob/8dc13350/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 3a5db4a..e08d85f 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 @@ -79,6 +79,11 @@ {{#if view.isDowngradeAvailable}} <button class="btn btn-danger" {{bindAttr disabled="controller.requestInProgress"}} {{action confirmDowngrade view.failedItem target="controller"}}>{{t common.downgrade}}</button> {{/if}} + {{#if isDowngrade}} + <button class="btn" {{action closeWizard target="view.parentView"}}>{{t admin.stackUpgrade.pauseDowngrade}}</button> + {{else}} + <button class="btn" {{action pauseUpgrade target="view"}}>{{t admin.stackUpgrade.pauseUpgrade}}</button> + {{/if}} {{#if view.failedItem.skippable}} <button class="btn btn-warning" {{bindAttr disabled="controller.requestInProgress"}} {{action continue view.failedItem target="view"}}>{{t admin.stackUpgrade.dialog.continue}}</button> {{/if}}
