ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexantone...@apache.org
Subject [1/2] ambari git commit: AMBARI-20806. Upgrade Pause button should not show when the Upgrade is already Paused (alexantonenko)
Date Fri, 21 Apr 2017 06:23:17 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk ad4e11cc0 -> 836c78995


AMBARI-20806. Upgrade Pause button should not show when the Upgrade is already Paused (alexantonenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/836c7899
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/836c7899
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/836c7899

Branch: refs/heads/trunk
Commit: 836c789956b4087f5f6cf30c3dc0d333e702c72a
Parents: d98db01
Author: Alex Antonenko <hiveww@gmail.com>
Authored: Thu Apr 20 19:02:05 2017 +0300
Committer: Alex Antonenko <hiveww@gmail.com>
Committed: Fri Apr 21 09:23:13 2017 +0300

----------------------------------------------------------------------
 .../admin/stack_upgrade/stack_upgrade_wizard.hbs    | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/836c7899/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 b2e8991..6fceeb1 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
@@ -39,13 +39,15 @@
     {{#if view.isLoaded}}
       <div>
         <div class="row">
-          {{#if isDowngrade}}
-            <button
-              class="btn btn-default" {{action confirmPauseDowngrade target="view"}}>{{t
admin.stackUpgrade.pauseDowngrade}}</button>
-          {{else}}
-            <button
-              class="btn btn-default" {{action confirmPauseUpgrade target="view"}}>{{t
admin.stackUpgrade.pauseUpgrade}}</button>
-          {{/if}}
+          {{#unless App.upgradeSuspended}}
+              {{#if isDowngrade}}
+                <button
+                  class="btn btn-default" {{action confirmPauseDowngrade target="view"}}>{{t
admin.stackUpgrade.pauseDowngrade}}</button>
+              {{else}}
+                <button
+                  class="btn btn-default" {{action confirmPauseUpgrade target="view"}}>{{t
admin.stackUpgrade.pauseUpgrade}}</button>
+              {{/if}}
+          {{/unless}}
         </div>
         {{#if view.runningItem}}
           <div class="panel panel-default details-box row">


Mime
View raw message