You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jl...@apache.org on 2017/05/17 20:51:49 UTC
[15/25] ambari git commit: AMBARI-21041. Pause Upgrade button is
present in the wizard even after Upgrade is finalized (alexantonenko)
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/99d4ca1e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/99d4ca1e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/99d4ca1e
Branch: refs/heads/branch-feature-AMBARI-14714
Commit: 99d4ca1e7171648086a3c0536cd6badbac172707
Parents: 3b94d3c
Author: Alex Antonenko <hi...@gmail.com>
Authored: Wed May 17 15:27:01 2017 +0300
Committer: Alex Antonenko <hi...@gmail.com>
Committed: Wed May 17 15:51:50 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/99d4ca1e/ambari-web/app/app.js
----------------------------------------------------------------------
diff --git a/ambari-web/app/app.js b/ambari-web/app/app.js
index 6d02603..c22d71c 100644
--- a/ambari-web/app/app.js
+++ b/ambari-web/app/app.js
@@ -69,6 +69,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/99d4ca1e/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 94cdf1c..0f2efb0 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
@@ -71,7 +71,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}