Repository: ambari Updated Branches: refs/heads/branch-2.2 3cbcca53e -> 8c08db66c
AMBARI-15816: EU/RU - cannot resume upgrade after pausing on a manual task (rzang) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/8c08db66 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/8c08db66 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/8c08db66 Branch: refs/heads/branch-2.2 Commit: 8c08db66c55fec9592a0b2b1053b7f2da31e9197 Parents: 3cbcca5 Author: Richard Zang <[email protected]> Authored: Mon Apr 11 16:34:14 2016 -0700 Committer: Richard Zang <[email protected]> Committed: Mon Apr 11 16:35:11 2016 -0700 ---------------------------------------------------------------------- .../app/views/main/admin/stack_upgrade/upgrade_wizard_view.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/8c08db66/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js index 7c5bd29..2924591 100644 --- a/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js +++ b/ambari-web/app/views/main/admin/stack_upgrade/upgrade_wizard_view.js @@ -454,8 +454,10 @@ App.upgradeWizardView = Em.View.extend({ }, pauseUpgrade: function() { - this.get('controller').suspendUpgrade(); - this.get('parentView').closeWizard(); + var self = this; + this.get('controller').suspendUpgrade().done(function() { + self.get('parentView').closeWizard(); + }); }, /**
