Repository: ambari Updated Branches: refs/heads/trunk 7e7b6709d -> 443da921b
AMBARI-5541 JS error upon revisiting Install, Start and Test page. (atkach) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/443da921 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/443da921 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/443da921 Branch: refs/heads/trunk Commit: 443da921b0f8a8e62259e12147c83d2749ab5621 Parents: 7e7b670 Author: atkach <atk...@hortonworks.com> Authored: Wed Apr 23 15:23:30 2014 +0300 Committer: atkach <atk...@hortonworks.com> Committed: Wed Apr 23 15:26:12 2014 +0300 ---------------------------------------------------------------------- ambari-web/app/models/cluster_states.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/443da921/ambari-web/app/models/cluster_states.js ---------------------------------------------------------------------- diff --git a/ambari-web/app/models/cluster_states.js b/ambari-web/app/models/cluster_states.js index 270a50c..0d88860 100644 --- a/ambari-web/app/models/cluster_states.js +++ b/ambari-web/app/models/cluster_states.js @@ -115,7 +115,7 @@ App.clusterStatus = Em.Object.create(App.UserPref, { this.set('additionalData', { user: App.db.getUser(), login: App.db.getLoginName(), - overrideLocaldb: overrideLocaldb || true + overrideLocaldb: Em.isNone(overrideLocaldb) ? true : overrideLocaldb }); return this.getUserPref(this.get('key')); }, @@ -142,11 +142,11 @@ App.clusterStatus = Em.Object.create(App.UserPref, { this.set('localdb', response.localdb); // restore HAWizard data if process was started var isHAWizardStarted = App.get('isAdmin') && !App.isEmptyObject(response.localdb.HighAvailabilityWizard); - if (params.overrideLocaldb || isHAWizardStarted) { + if (params.data.overrideLocaldb || isHAWizardStarted) { App.db.data = response.localdb; App.db.setLocalStorage(); - App.db.setUser(params.user); - App.db.setLoginName(params.login); + App.db.setUser(params.data.user); + App.db.setLoginName(params.data.login); } } }
