From a30fe62b116e6f192bc2a52cfa51b3280693699f Mon Sep 17 00:00:00 2001
From: olgasmola <olya.smola@gmail.com>
Date: Mon, 18 Jun 2012 16:04:37 +0300
Subject: [PATCH] CS-14047: Return the user to the log in page when login time
 out.

---
 ui/scripts/cloudStack.js | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js
index 1decd685637..3293c2540f0 100644
--- a/ui/scripts/cloudStack.js
+++ b/ui/scripts/cloudStack.js
@@ -66,14 +66,31 @@
       dataType: 'json',
       cache: false,
       error: function(data) {
-        cloudStack.dialog.notice({ message: parseXMLHttpResponse(data) });
+	    var clickAction = false;
+		if (isValidJsonString(data.responseText)) {
+			var json = JSON.parse(data.responseText);
+			if (json != null) {
+				var property;
+				for(property in json) {}
+				var errorObj = json[property];
+				if(errorObj.errorcode == 401 && errorObj.errortext == "unable to verify user credentials and/or request signature") {
+					clickAction = function() {
+						$('#user-options a').eq(0).trigger('click');
+					};
+				}
+			}
+		}
+		cloudStack.dialog.notice({ message: parseXMLHttpResponse(data), clickAction: clickAction });
       },
-			beforeSend: function(XMLHttpRequest) {		
+			beforeSend: function(XMLHttpRequest) {
 				if (g_mySession == $.cookie("JSESSIONID")) {
 					return true;
 				} 
 				else {
-					cloudStack.dialog.notice({ message: _l('label.session.expired') });
+					var clickAction = function() {
+						$('#user-options a').eq(0).trigger('click');
+					};
+					cloudStack.dialog.notice({ message: _l('label.session.expired'), clickAction: clickAction });
 					return false;
 				}
 			}