Repository: ambari Updated Branches: refs/heads/trunk 98405ef9b -> 25ebb0532
AMBARI-11858. Ambari web UI keeps challenging users to re-log in (akovalenko) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/25ebb053 Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/25ebb053 Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/25ebb053 Branch: refs/heads/trunk Commit: 25ebb0532c8f1f7779012b576c035a213edc26f5 Parents: 98405ef Author: Aleksandr Kovalenko <[email protected]> Authored: Thu Jun 11 15:54:53 2015 +0300 Committer: Aleksandr Kovalenko <[email protected]> Committed: Thu Jun 11 17:07:36 2015 +0300 ---------------------------------------------------------------------- ambari-web/app/models/cluster_states.js | 5 +++++ 1 file changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/25ebb053/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 f4a9b59..7866f47 100644 --- a/ambari-web/app/models/cluster_states.js +++ b/ambari-web/app/models/cluster_states.js @@ -140,10 +140,12 @@ App.clusterStatus = Em.Object.create(App.UserPref, { var isHAWizardStarted = App.isAccessible('ADMIN') && !App.isEmptyObject(response.localdb.HighAvailabilityWizard); if (params.data.overrideLocaldb || isHAWizardStarted) { var localdbTables = (App.db.data.app && App.db.data.app.tables) ? App.db.data.app.tables : {}; + var authenticated = Em.get(App, 'db.data.app.authenticated') || false; App.db.data = response.localdb; App.db.setLocalStorage(); App.db.setUser(params.data.user); App.db.setLoginName(params.data.login); + App.db.setAuthenticated(authenticated); App.db.data.app.tables = localdbTables; } } @@ -223,12 +225,15 @@ App.clusterStatus = Em.Object.create(App.UserPref, { delete newValue.localdb.app.loginName; if (newValue.localdb.app && newValue.localdb.app.tables) delete newValue.localdb.app.tables; + if (newValue.localdb.app && newValue.localdb.app.authenticated) + delete newValue.localdb.app.authenticated; this.set('localdb', newValue.localdb); val.localdb = newValue.localdb; } else { delete App.db.data.app.user; delete App.db.data.app.loginName; delete App.db.data.app.tables; + delete App.db.data.app.authenticated; val.localdb = App.db.data; App.db.setUser(user); App.db.setLoginName(login);
