From 7de2b4b30adbf48922f849eb10fd5f49f6d19ad0 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica.wang@citrix.com>
Date: Sun, 7 Apr 2013 11:40:46 -0700
Subject: [PATCH] CLOUDSTACK-1957: cloudstack UI - fix a JS error "'logout' is
 undefined" which sometimes shows on login screen.

---
 ui/scripts/cloudStack.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js
index faa77899da1..0cf80b02066 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;