فهرست منبع

AMBARI-13757. Pause Upgrade is not sending abort request on 'Pause Upgrade'.(xiwang)

Xi Wang 9 سال پیش
والد
کامیت
36e20f9f69

+ 3 - 3
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}}

+ 1 - 3
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();
   }
 });