Updated Branches: refs/heads/branch-1.2.5 7bd06c35d -> 1ddccc15e
AMBARI-2661: Security wizard: Relogin while on step3 without quitting the wizard throws JS error. (jaimin) Project: http://git-wip-us.apache.org/repos/asf/incubator-ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ambari/commit/1ddccc15 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ambari/tree/1ddccc15 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ambari/diff/1ddccc15 Branch: refs/heads/branch-1.2.5 Commit: 1ddccc15e3a4ed9c06397a9dd086428602435646 Parents: 7bd06c3 Author: Jaimin Jetly <[email protected]> Authored: Tue Jul 16 12:39:38 2013 -0700 Committer: Jaimin Jetly <[email protected]> Committed: Tue Jul 16 12:39:43 2013 -0700 ---------------------------------------------------------------------- ambari-web/app/routes/main.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ambari/blob/1ddccc15/ambari-web/app/routes/main.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/routes/main.js b/ambari-web/app/routes/main.js index e1dd26f..426cbcc 100644 --- a/ambari-web/app/routes/main.js +++ b/ambari-web/app/routes/main.js @@ -661,11 +661,10 @@ module.exports = Em.Route.extend({ if (currentClusterStatus.localdb) { App.db.setSecurityDeployStages(currentClusterStatus.localdb.securityDeployStages); controller.setAddSecurityWizardStatus(currentClusterStatus.localdb.status); - App.db.setServiceConfigProperties(currentClusterStatus.localdb.secureConfigProperties); + App.db.setSecureConfigProperties(currentClusterStatus.localdb.secureConfigProperties); App.db.setWizardCurrentStep('AddSecurity', currentClusterStatus.localdb.currentStep); App.db.setDisableSecurityStatus(currentClusterStatus.localdb.disableSecurityStatus); } - } if (!(controller.getAddSecurityWizardStatus() === 'RUNNING') && !(controller.getDisableSecurityStatus() === 'RUNNING')) { Em.run.next(function () {
