Author: channa Date: Thu Jul 31 07:56:22 2008 New Revision: 20268 URL: http://wso2.org/svn/browse/wso2?view=rev&revision=20268
Log: Adding call to validate_login if 'remember me' has been turned on, to restore session if expired during a source edit. Suggesting a login workaround if 'remember me' was not used. Modified: trunk/mashup/java/modules/www/editor.jsp trunk/mashup/java/modules/www/js/services.js Modified: trunk/mashup/java/modules/www/editor.jsp URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/editor.jsp?rev=20268&r1=20267&r2=20268&view=diff ============================================================================== --- trunk/mashup/java/modules/www/editor.jsp (original) +++ trunk/mashup/java/modules/www/editor.jsp Thu Jul 31 07:56:22 2008 @@ -119,6 +119,7 @@ <script type="text/javascript" src="js/main.js"></script> <script type="text/javascript" src="js/mashup-main.js"></script> <script type="text/javascript" src="js/mashup-utils.js"></script> +<script type="text/javascript" src="js/InformationCards.js"></script> <script language="javascript" src="js/wso2/WSRequest.js" type="text/javascript"></script> <script language="javascript" src="js/base64.js" type="text/javascript"></script> <script language="javascript" src="js/services.js" type="text/javascript"></script> Modified: trunk/mashup/java/modules/www/js/services.js URL: http://wso2.org/svn/browse/wso2/trunk/mashup/java/modules/www/js/services.js?rev=20268&r1=20267&r2=20268&view=diff ============================================================================== --- trunk/mashup/java/modules/www/js/services.js (original) +++ trunk/mashup/java/modules/www/js/services.js Thu Jul 31 07:56:22 2008 @@ -686,7 +686,15 @@ if (!error) { WSO2.MashupUtils.dialog("An error occured", "Console has received an error. Please refer to system admin for more details.<br/><div style='text-align:right;'><input type='button' value='Close' onclick='WSO2.MashupUtils.dialog.close();'/></div>", 200, 50, null); } else if (error.reason.indexOf("Access Denied. Please login first") > -1) { - WSO2.MashupUtils.dialog("An error occured", "Your session has expired.<br/><div style='text-align:right;'><input type='button' value='Close' onclick='WSO2.MashupUtils.dialog.close();'/></div>", 200, 50, null); + var rememberMe = BrowserUtility.Cookie("rememberMe"); + var dialogText; + if (rememberMe == 'true') { + dialogText = "Attempting to restore session.<br/>Please close this dialog and <strong>Retry</strong> the operation.<IFRAME src='validate_login.jsp' height='1' width='1'></IFRAME>"; + } else { + dialogText = "Please sign in using a separate window or tab and then retry the operation."; + } + WSO2.MashupUtils.dialog("Session Expired", dialogText + "<div style='text-align:right;'>" + + "<input type='button' value='Close' onclick='WSO2.MashupUtils.dialog.close();'/></div>", 300, 50, null); //Envoking force logout //wso2.mashup.handleLogout(); } else if (typeof (error.detail.indexOf) != "undefined" && _______________________________________________ Mashup-dev mailing list [email protected] http://mailman.wso2.org/cgi-bin/mailman/listinfo/mashup-dev
