Repository: ambari Updated Branches: refs/heads/branch-2.5 2e5d2a9d3 -> d29220d8a
AMBARI-19200 Turning OFF maintenance mode shows a popup on all hosts. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/d29220d8 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/d29220d8 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/d29220d8 Branch: refs/heads/branch-2.5 Commit: d29220d8a09df7eef509b8cc4f7792d28980943e Parents: 2e5d2a9 Author: Andrii Tkach <atk...@apache.org> Authored: Wed Dec 14 14:53:51 2016 +0200 Committer: Andrii Tkach <atk...@apache.org> Committed: Wed Dec 14 17:38:57 2016 +0200 ---------------------------------------------------------------------- .../app/controllers/global/cluster_controller.js | 15 +++++++-------- .../controllers/global/cluster_controller_test.js | 4 ++-- 2 files changed, 9 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/d29220d8/ambari-web/app/controllers/global/cluster_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/global/cluster_controller.js b/ambari-web/app/controllers/global/cluster_controller.js index ea80c41..58fac34 100644 --- a/ambari-web/app/controllers/global/cluster_controller.js +++ b/ambari-web/app/controllers/global/cluster_controller.js @@ -306,20 +306,19 @@ App.ClusterController = Em.Controller.extend(App.ReloadPopupMixin, { var dbUpgradeState = App.db.get('MainAdminStackAndUpgrade', 'upgradeState'); //completed upgrade shouldn't be restored - if (lastUpgradeData && lastUpgradeData.Upgrade.request_status === "COMPLETED") { - return; + if (lastUpgradeData) { + if (lastUpgradeData.Upgrade.request_status !== "COMPLETED") { + upgradeController.restoreLastUpgrade(lastUpgradeData); + } + } else { + upgradeController.initDBProperties(); + upgradeController.loadUpgradeData(true); } if (!Em.isNone(dbUpgradeState)) { App.set('upgradeState', dbUpgradeState); } - if (lastUpgradeData) { - upgradeController.restoreLastUpgrade(lastUpgradeData); - } else { - upgradeController.initDBProperties(); - upgradeController.loadUpgradeData(true); - } upgradeController.loadStackVersionsToModel(true).done(function () { App.set('stackVersionsAvailable', App.StackVersion.find().content.length > 0); }); http://git-wip-us.apache.org/repos/asf/ambari/blob/d29220d8/ambari-web/test/controllers/global/cluster_controller_test.js ---------------------------------------------------------------------- diff --git a/ambari-web/test/controllers/global/cluster_controller_test.js b/ambari-web/test/controllers/global/cluster_controller_test.js index fa95c3e..47708ac 100644 --- a/ambari-web/test/controllers/global/cluster_controller_test.js +++ b/ambari-web/test/controllers/global/cluster_controller_test.js @@ -533,8 +533,8 @@ describe('App.clusterController', function () { expect(upgradeController.restoreLastUpgrade.called).to.be.false; }); - it('loadStackVersionsToModel should not be called', function () { - expect(upgradeController.loadStackVersionsToModel.called).to.be.false; + it('loadStackVersionsToModel should be called', function () { + expect(upgradeController.loadStackVersionsToModel).to.be.calledOnce; }); });
