From 31997fa89dbb7ebf8b637f91e06dd46e07bdf689 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Fri, 27 Apr 2012 14:58:54 -0700 Subject: [PATCH] bug 14610: cloudstack 3.0 - single sign on - log out - not reload original location if onLogoutCallback() returns false because new location has been specified in onLogoutCallback(). --- ui/scripts/cloudStack.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js index 4786efc48dc..b7101d79c68 100644 --- a/ui/scripts/cloudStack.js +++ b/ui/scripts/cloudStack.js @@ -316,12 +316,15 @@ $.cookie('timezoneoffset', null); $.cookie('timezone', null); $.cookie('supportELB', null); - - onLogoutCallback(); //set g_loginResponse(single-sign-on variable) to null, then bypassLoginCheck() will show login screen. - document.location.reload(); + + if(onLogoutCallback()) { //set g_loginResponse(single-sign-on variable) to null, then bypassLoginCheck() will show login screen. + document.location.reload(); + } }, error: function() { - onLogoutCallback(); //set g_loginResponse(single-sign-on variable) to null, then bypassLoginCheck() will show login screen. + if(onLogoutCallback()) { //set g_loginResponse(single-sign-on variable) to null, then bypassLoginCheck() will show login screen. + document.location.reload(); + } document.location.reload(); }, beforeSend : function(XMLHttpResponse) {