Author: ktlili
Date: Tue Oct 9 12:28:14 2007
New Revision: 18792
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18792&repname=
=3Djahia
Log:
- fix JAHIA-2438 : deal with "?" and "&" in "applyEngineUrl"
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/common/apply=
.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/common=
/apply.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/views/engines/common/apply.jsp&rev=3D18792&repname=
=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/common/apply=
.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/views/engines/common/apply=
.jsp Tue Oct 9 12:28:14 2007
@@ -1,11 +1,30 @@
<%@ page language=3D"java" %>
<%@ page import=3D"java.util.*" %>
=
+<%!
+ private String composeApplyJahiaWindowUrl(final String url, final Stri=
ng screen) {
+ if (url !=3D null) {
+ String applyJahiaWindowUrl =3D new String(url);
+ if (url.indexOf('?') > -1) {
+ // url has at least one parameter
+ applyJahiaWindowUrl =3D applyJahiaWindowUrl + "&";
+ } else {
+ // url hasn't parameters
+ applyJahiaWindowUrl =3D applyJahiaWindowUrl + "?";
+ }
+ applyJahiaWindowUrl =3D applyJahiaWindowUrl + "screen=3D" + sc=
reen;
+ return applyJahiaWindowUrl;
+ }
+ return null;
+ }
+%>
+
<%
- HashMap engineMap =3D (HashMap)request.getAttribute( "org.jahia.engine=
s.EngineHashMap" );
- String javaScriptPath =3D (String)engineMap.get( "javaScriptPath" );
- String url =3D (String)engineMap.get("engineUrl");
- String screen =3D (String)engineMap.get("screen");
+ HashMap engineMap =3D (HashMap) request.getAttribute("org.jahia.engine=
s.EngineHashMap");
+ String javaScriptPath =3D (String) engineMap.get("javaScriptPath");
+ String url =3D (String) engineMap.get("engineUrl");
+ String screen =3D (String) engineMap.get("screen");
+
%>
=
<html>
@@ -14,7 +33,7 @@
<script language=3D"javascript" src=3D"<%=3DjavaScriptPath%>">
</script>
<script language=3D"javascript">
- applyJahiaWindow("<%=3Durl%>" + "&screen=3D" + "<%=3Dscreen%>" );
+ applyJahiaWindow("<%=3DcomposeApplyJahiaWindowUrl(url, screen)%>");
</script>
=
</head>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
