ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexantone...@apache.org
Subject [2/2] ambari git commit: AMBARI-20692. Add Ability to Pause An Upgrade In Progress (alexantonenko)
Date Thu, 20 Apr 2017 16:00:06 GMT
AMBARI-20692. Add Ability to Pause An Upgrade In Progress (alexantonenko)


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

Branch: refs/heads/branch-2.5
Commit: dbff3ea0b2dda9ef634306d8fce65c03fefb4c6b
Parents: beee84c
Author: Alex Antonenko <hiveww@gmail.com>
Authored: Thu Apr 20 18:59:37 2017 +0300
Committer: Alex Antonenko <hiveww@gmail.com>
Committed: Thu Apr 20 18:59:59 2017 +0300

----------------------------------------------------------------------
 .../stack_upgrade/stack_upgrade_wizard.hbs      | 41 +++++++-------------
 1 file changed, 15 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/dbff3ea0/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 4678f01..2ed0ddc 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
@@ -38,6 +38,15 @@
   <div class="task-list scrollable-block task-list-main-warp">
     {{#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}}
+        </div>
         {{#if view.runningItem}}
           <div class="box details-box">
             <div class="row-fluid">
@@ -80,11 +89,6 @@
                   {{#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 confirmPauseDowngrade target="view"}}>{{t
admin.stackUpgrade.pauseDowngrade}}</button>
-                  {{else}}
-                    <button class="btn" {{action confirmPauseUpgrade 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}}
@@ -108,14 +112,9 @@
               {{#if view.isDowngradeAvailable}}
                 <button class="btn btn-danger" {{bindAttr disabled="controller.requestInProgress"}}
{{action confirmDowngrade view.manualItem target="controller"}}>{{t common.downgrade}}</button>
               {{/if}}
-              {{#if isDowngrade}}
-                <button class="btn" {{action confirmPauseDowngrade target="view"}}>{{t
admin.stackUpgrade.pauseDowngrade}}</button>
-              {{else}}
-                <button class="btn" {{action confirmPauseUpgrade 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}}
-                </button>
+              <button class="btn btn-success" {{bindAttr disabled="view.isManualProceedDisabled"}}
{{action complete view.manualItem target="view"}}>
+                {{t common.proceed}}
+              </button>
             </div>
           </div>
         {{/if}}
@@ -190,11 +189,6 @@
               {{#if view.isDowngradeAvailable}}
                 <button class="btn btn-danger" {{bindAttr disabled="controller.requestInProgress"}}
{{action confirmDowngrade view.manualItem target="controller"}}>{{t common.downgrade}}</button>
               {{/if}}
-              {{#if isDowngrade}}
-                <button class="btn" {{action confirmPauseDowngrade target="view"}}>{{t
admin.stackUpgrade.pauseDowngrade}}</button>
-              {{else}}
-                <button class="btn" {{action confirmPauseUpgrade target="view"}}>{{t
admin.stackUpgrade.pauseUpgrade}}</button>
-              {{/if}}
               {{#if view.isHoldingState}}
                 <button class="btn" {{bindAttr disabled="controller.requestInProgress"}}
{{action retry view.failedItem target="view"}}>{{t common.retry}}</button>
               {{else}}
@@ -253,14 +247,9 @@
               {{#if view.isDowngradeAvailable}}
                   <button class="btn btn-danger" {{bindAttr disabled="controller.requestInProgress"}}
{{action confirmDowngrade view.manualItem target="controller"}}>{{t common.downgrade}}</button>
               {{/if}}
-              {{#if isDowngrade}}
-                <button class="btn" {{action confirmPauseDowngrade target="view"}}>{{t
admin.stackUpgrade.pauseDowngrade}}</button>
-              {{else}}
-                <button class="btn" {{action confirmPauseUpgrade 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}}
-                </button>
+              <button class="btn btn-success" {{bindAttr disabled="view.isManualProceedDisabled"}}
{{action complete view.manualItem target="view"}}>
+                {{t common.proceed}}
+              </button>
             </div>
           </div>
         {{/if}}


Mime
View raw message