You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by xi...@apache.org on 2015/11/06 20:39:37 UTC
ambari git commit: AMBARI-13757. Pause Upgrade is not sending abort
request on 'Pause Upgrade'.(xiwang)
Repository: ambari
Updated Branches:
refs/heads/trunk beb5c49d3 -> 36e20f9f6
AMBARI-13757. Pause Upgrade is not sending abort request on 'Pause Upgrade'.(xiwang)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/36e20f9f
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/36e20f9f
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/36e20f9f
Branch: refs/heads/trunk
Commit: 36e20f9f691eace4775ad55e1aa438de0e15a0e9
Parents: beb5c49
Author: Xi Wang <xi...@apache.org>
Authored: Fri Nov 6 11:03:36 2015 -0800
Committer: Xi Wang <xi...@apache.org>
Committed: Fri Nov 6 11:03:36 2015 -0800
----------------------------------------------------------------------
.../main/admin/stack_upgrade/stack_upgrade_wizard.hbs | 6 +++---
.../app/views/main/admin/stack_upgrade/upgrade_wizard_view.js | 4 +---
2 files changed, 4 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/36e20f9f/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 fd915a3..92c735f 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
@@ -118,7 +118,7 @@
{{#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>
+ <button class="btn" {{action pauseUpgrade target="view"}}>{{t admin.stackUpgrade.pauseUpgrade}}</button>
{{/if}}
<button class="btn btn-success" {{bindAttr disabled="view.isManualProceedDisabled"}} {{action complete view.manualItem target="view"}}>
{{t common.proceed}}
@@ -166,7 +166,7 @@
{{#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>
+ <button class="btn" {{action pauseUpgrade target="view"}}>{{t admin.stackUpgrade.pauseUpgrade}}</button>
{{/if}}
<button class="btn btn-success" {{bindAttr disabled="view.isManualProceedDisabled"}} {{action complete view.manualItem target="view"}}>
{{t common.proceed}}
@@ -227,7 +227,7 @@
{{#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>
+ <button class="btn" {{action pauseUpgrade target="view"}}>{{t admin.stackUpgrade.pauseUpgrade}}</button>
{{/if}}
<button class="btn btn-success" {{bindAttr disabled="view.isManualProceedDisabled"}} {{action complete view.manualItem target="view"}}>
{{t common.proceed}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/36e20f9f/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js
index fe4bfaa..a76a5af 100644
--- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js
+++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js
@@ -468,9 +468,7 @@ App.upgradeWizardView = Em.View.extend({
},
pauseUpgrade: function() {
- if (this.get('isFinalizeItem')) {
- this.get('controller').suspendUpgrade();
- }
+ this.get('controller').suspendUpgrade();
this.get('parentView').closeWizard();
}
});