shuber 2004/10/28 20:09:41 CEST
Modified files:
core/src/webapp/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.2 +6 -2 jahia/core/src/webapp/jsp/jahia/errors/error_include.js
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/errors/error_include.js.diff?r1=1.1&r2=1.2&f=h
Index: error_include.js
===================================================================
RCS file:
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/errors/error_include.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- error_include.js 30 Mar 2004 14:16:26 -0000 1.1
+++ error_include.js 28 Oct 2004 18:09:41 -0000 1.2
@@ -18,13 +18,17 @@
}
}
} else {
-
+ 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
