Repository: ambari Updated Branches: refs/heads/trunk 6f4045eb3 -> 2c4c81df3
AMBARI-9623 Admin page loaded after login/log out on secured cluster. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2c4c81df Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2c4c81df Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2c4c81df Branch: refs/heads/trunk Commit: 2c4c81df31a10889549554ccf8c7772918be5935 Parents: 6f4045e Author: Andrii Tkach <atk...@hortonworks.com> Authored: Fri Feb 13 15:11:13 2015 +0200 Committer: Andrii Tkach <atk...@hortonworks.com> Committed: Fri Feb 13 15:11:13 2015 +0200 ---------------------------------------------------------------------- .../main/admin/kerberos/wizard_controller.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/2c4c81df/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js b/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js index 9c85c67..6933536 100644 --- a/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js +++ b/ambari-web/app/controllers/main/admin/kerberos/wizard_controller.js @@ -46,9 +46,15 @@ App.KerberosWizardController = App.WizardController.extend({ failedTask: null }), - setCurrentStep: function (currentStep, completed) { + /** + * set current step + * @param {string} currentStep + * @param {boolean} completed + * @param {boolean} skipStateSave + */ + setCurrentStep: function (currentStep, completed, skipStateSave) { this._super(currentStep, completed); - if (App.get('testMode')) { + if (App.get('testMode') || skipStateSave) { return; } App.clusterStatus.setClusterStatus({ @@ -290,8 +296,8 @@ App.KerberosWizardController = App.WizardController.extend({ * Clear all temporary data */ finish: function () { - // The in-memory variable for currentstep should be reset to 1st step. - this.setCurrentStep('1'); + // The in-memory variable for current step should be reset to 1st step. + this.setCurrentStep('1', false, true); // kerberos wizard namespace in the localStorage should be emptied this.resetDbNamespace(); App.get('router.updateController').updateAll();
