shuber 2004/10/28 20:08:39 CEST
Modified files: (Branch: JAHIA-4-0-BRANCH)
src/views/jsp/jahia/errors error_include.js
Log:
Fix for JAHIA-210 :
- Login window should now open even if page URL has query string parameters (the
stuff after a "?" in the URL).
Revision Changes Path
1.3.4.1 +10 -6 jahia/src/views/jsp/jahia/errors/error_include.js
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/src/views/jsp/jahia/errors/error_include.js.diff?r1=1.3&r2=1.3.4.1&f=h
Index: error_include.js
===================================================================
RCS file:
/home/cvs/repository/jahia/src/views/jsp/jahia/errors/Attic/error_include.js,v
retrieving revision 1.3
retrieving revision 1.3.4.1
diff -u -r1.3 -r1.3.4.1
--- error_include.js 28 Nov 2002 23:24:03 -0000 1.3
+++ error_include.js 28 Oct 2004 18:08:38 -0000 1.3.4.1
@@ -10,7 +10,7 @@
if (posB != -1) {
oldurl = oldurl.substring( 0, posA ) + engineName +
oldurl.substring( posB, oldurl.length );
} else {
- posB = oldurl.indexOf( "?", posA );
+ posB = oldurl.indexOf( "?", posA );
if (posB != -1) {
oldurl = oldurl.substring( 0, posA ) + engineName;
} else {
@@ -18,13 +18,17 @@
}
}
} else {
-
- oldurl = oldurl +"/engineName/" + engineName;
+ var posB = oldurl.indexOf( "?" );
+ if (posB != -1) {
+ oldurl = oldurl.substring( 0, posB ) +"/engineName/" + engineName +
oldurl.substring( posB, oldurl.length );
+ } else {
+ oldurl = oldurl + "/engineName/" + engineName;
+ }
}
-
+
if (oldurl != location.href)
{
var params = "width=" + 260 + ",height=" + 300 +
",resizable=1,scrollbars=0,status=0";
- var myWin = window.open( oldurl, "Login", params );
+ var myWin = window.open( oldurl, engineName , params );
}
- }
\ No newline at end of file
+ }
