CLOUDSTACK-1957: cloudstack UI - fix a JS error "'logout' is undefined" which sometimes shows on login screen.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/23a2500f Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/23a2500f Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/23a2500f Branch: refs/heads/internallb Commit: 23a2500f31aa7b2cbb9354c087547d816b22ab1f Parents: ae29656 Author: Jessica Wang <jessica.w...@citrix.com> Authored: Sun Apr 7 11:40:46 2013 -0700 Committer: Alena Prokharchyk <alena.prokharc...@citrix.com> Committed: Mon Apr 8 15:23:55 2013 -0700 ---------------------------------------------------------------------- ui/scripts/cloudStack.js | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/23a2500f/ui/scripts/cloudStack.js ---------------------------------------------------------------------- diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js index faa7789..0cf80b0 100644 --- a/ui/scripts/cloudStack.js +++ b/ui/scripts/cloudStack.js @@ -115,6 +115,11 @@ // Use this for checking the session, to bypass login screen bypassLoginCheck: function(args) { //determine to show or bypass login screen if (g_loginResponse == null) { //show login screen + /* + but if this is a 2nd browser window (of the same domain), login screen still won't show because $.cookie('sessionKey') is valid for 2nd browser window (of the same domain) as well. + i.e. calling listCapabilities API with g_sessionKey from $.cookie('sessionKey') will succeed, + then userValid will be set to true, then an user object (instead of "false") will be returned, then login screen will be bypassed. + */ g_mySession = $.cookie('JSESSIONID'); g_sessionKey = $.cookie('sessionKey'); g_role = $.cookie('role'); @@ -176,8 +181,7 @@ userValid = true; }, - error: function(xmlHTTP) { - logout(false); + error: function(xmlHTTP) { //override default error handling, do nothing instead of showing error "unable to verify user credentials" on login screen }, beforeSend : function(XMLHttpResponse) { return true;
