ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexantone...@apache.org
Subject ambari git commit: AMBARI-21041. Pause Upgrade button is present in the wizard even after Upgrade is finalized (alexantonenko)
Date Wed, 17 May 2017 12:52:37 GMT
Repository: ambari
Updated Branches:
  refs/heads/branch-2.5 b6bc82b77 -> 447c9c977


AMBARI-21041. Pause Upgrade button is present in the wizard even after Upgrade is finalized
(alexantonenko)


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

Branch: refs/heads/branch-2.5
Commit: 447c9c977b1e0a5c2279badb17350ac35689012c
Parents: b6bc82b
Author: Alex Antonenko <hiveww@gmail.com>
Authored: Wed May 17 15:26:02 2017 +0300
Committer: Alex Antonenko <hiveww@gmail.com>
Committed: Wed May 17 15:52:33 2017 +0300

----------------------------------------------------------------------
 ambari-web/app/app.js                                         | 7 +++++++
 .../controllers/main/admin/stack_and_upgrade_controller.js    | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/447c9c97/ambari-web/app/app.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/app.js b/ambari-web/app/app.js
index fcc770c..1c73550 100644
--- a/ambari-web/app/app.js
+++ b/ambari-web/app/app.js
@@ -65,6 +65,13 @@ module.exports = Em.Application.create({
   upgradeState: 'INIT',
 
   /**
+   * Check if upgrade is in INIT state
+   * 'INIT' is set on upgrade start and when it's finished
+   * @type {boolean}
+   */
+  upgradeInit: Em.computed.equal('upgradeState', 'INIT'),
+
+  /**
    * flag is true when upgrade process is running
    * @returns {boolean}
    */

http://git-wip-us.apache.org/repos/asf/ambari/blob/447c9c97/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
index f0a222c..6a02d0c 100644
--- a/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
+++ b/ambari-web/app/controllers/main/admin/stack_and_upgrade_controller.js
@@ -64,7 +64,7 @@ App.MainAdminStackAndUpgradeController = Em.Controller.extend(App.LocalStorage,
   /**
    * @type {boolean}
    */
-  showPauseButton: Em.computed.and('!App.upgradeSuspended', '!App.upgradeCompleted'),
+  showPauseButton: Em.computed.and('!App.upgradeSuspended', '!App.upgradeCompleted', '!App.upgradeInit'),
 
   /**
    * @type {boolean}


Mime
View raw message