You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by at...@apache.org on 2017/10/02 14:11:56 UTC
ambari git commit: AMBARI-22108 Dismissing Enable Kerberos wizard
initiates Disable kerberos call. (atkach)
Repository: ambari
Updated Branches:
refs/heads/branch-2.6 c5233ac33 -> 4a29c923f
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/4a29c923
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/4a29c923
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/4a29c923
Branch: refs/heads/branch-2.6
Commit: 4a29c923fdfd7d085e001704616e77acfdfecda1
Parents: c5233ac
Author: Andrii Tkach <at...@apache.org>
Authored: Mon Oct 2 15:23:20 2017 +0300
Committer: Andrii Tkach <at...@apache.org>
Committed: Mon Oct 2 15:23:20 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/4a29c923/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 4dff258..c8535b4 100644
--- a/ambari-web/app/routes/add_kerberos_routes.js
+++ b/ambari-web/app/routes/add_kerberos_routes.js
@@ -58,6 +58,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();
@@ -69,20 +74,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);