Repository: ambari Updated Branches: refs/heads/branch-feature-AMBARI-20859 17243c68e -> 45ca79b38
AMBARI-22108 Dismissing Enable Kerberos wizard initiates Disable kerberos call. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/51baa64c Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/51baa64c Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/51baa64c Branch: refs/heads/branch-feature-AMBARI-20859 Commit: 51baa64c8a06641d3430da4e2efbcab7c5426fa2 Parents: 19fe4cf Author: Andrii Tkach <[email protected]> Authored: Mon Oct 2 15:23:20 2017 +0300 Committer: Andrii Tkach <[email protected]> Committed: Mon Oct 2 15:41:11 2017 +0300 ---------------------------------------------------------------------- ambari-web/app/routes/add_kerberos_routes.js | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/51baa64c/ambari-web/app/routes/add_kerberos_routes.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/routes/add_kerberos_routes.js b/ambari-web/app/routes/add_kerberos_routes.js index 50d5595..a13b5ae 100644 --- a/ambari-web/app/routes/add_kerberos_routes.js +++ b/ambari-web/app/routes/add_kerberos_routes.js @@ -60,6 +60,11 @@ module.exports = App.WizardRoute.extend({ self.exitWizard(); }, true); break; + case "8": + kerberosWizardController.warnBeforeExitPopup(function () { + self.exitWizard(true); + }, false); + break; default: kerberosWizardController.warnBeforeExitPopup(function () { self.exitWizard(); @@ -71,20 +76,17 @@ module.exports = App.WizardRoute.extend({ this.fitHeight(); }, - exitWizard: function () { - var kerberosProgressPageController = App.router.get('kerberosProgressPageController'); + exitWizard: function (skipDiscardChanges) { var controller = App.router.get('kerberosWizardController'); var exitPath = controller.getDBProperty('onClosePath') || 'adminKerberos.index'; controller.clearTasksData(); - controller.discardChanges().then(function() { - if (App.get('testMode')) { - App.get('router').transitionTo('adminKerberos.index'); - Em.run.next(function() { - location.reload(); - }); - } + if (skipDiscardChanges) { controller.resetOnClose(controller, exitPath); - }); + } else { + controller.discardChanges().then(function() { + controller.resetOnClose(controller, exitPath); + }); + } } }); kerberosWizardController.set('popup', popup);
