Ver Fonte

AMBARI-20841. Pause Button Appears After Successful Downgrade (alexantonenko)

Alex Antonenko há 8 anos atrás
pai
commit
8a7bba3e4e

+ 6 - 0
ambari-web/app/app.js

@@ -70,6 +70,12 @@ module.exports = Em.Application.create({
    */
   upgradeInProgress: Em.computed.equal('upgradeState', 'IN_PROGRESS'),
 
+  /**
+   * Checks if update process is completed
+   * @type {boolean}
+   */
+  upgradeCompleted: Em.computed.equal('upgradeState', 'COMPLETED'),
+
   /**
    * flag is true when upgrade process is waiting for user action
    * to proceed, retry, perform manual steps etc.

+ 5 - 0
ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js

@@ -61,6 +61,11 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
    */
   cantBeStarted: Em.computed.alias('upgradeTypeConfig.cantBeStarted'),
 
+  /**
+   * @type {boolean}
+   */
+  showPauseButton: Em.computed.and('!App.upgradeSuspended', '!App.upgradeCompleted'),
+
   /**
    * @type {boolean}
    * @default true

+ 1 - 0
ambari-web/app/styles/stack_versions.less

@@ -356,6 +356,7 @@
     padding: 5px;
     margin-left: 15px;
     margin-right: 95px;
+    margin-top: 10px;
     .button-row {
       text-align: right;
       padding: 5px;

+ 4 - 2
ambari-web/app/templates/main/admin/stack_upgrade/stack_upgrade_wizard.hbs

@@ -39,7 +39,8 @@
     {{#if view.isLoaded}}
       <div>
         <div class="row">
-          {{#unless App.upgradeSuspended}}
+          {{#if showPauseButton}}
+            <div class="span12">
               {{#if isDowngrade}}
                 <button
                   class="btn btn-default" {{action confirmPauseDowngrade target="view"}}>{{t admin.stackUpgrade.pauseDowngrade}}</button>
@@ -47,7 +48,8 @@
                 <button
                   class="btn btn-default" {{action confirmPauseUpgrade target="view"}}>{{t admin.stackUpgrade.pauseUpgrade}}</button>
               {{/if}}
-          {{/unless}}
+            </div>
+          {{/if}}
         </div>
         {{#if view.runningItem}}
           <div class="box details-box">