Author: cmailleux
Date: Thu May 24 11:33:59 2007
New Revision: 17369
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17369&repname=
=3Djahia
Log:
resolve issue JAHIA-1581
Add test to page properties engine name to fallback to a new url instead of=
url of the opener just in case we changed the url key of the page
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/c=
lose.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/sh=
ared/close.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/shared/close.jsp&rev=3D17369&repn=
ame=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/jsp/jahia/engines/shared/c=
lose.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/shared/c=
lose.jsp Thu May 24 11:33:59 2007
@@ -22,6 +22,8 @@
<%@ page import=3D"org.jahia.params.ParamBean" %>
<%@ page import=3D"org.jahia.services.pages.ContentPage" %>
<%@ page import=3D"java.util.HashMap"%>
+<%@ page import=3D"org.jahia.engines.pages.PageProperties_Engine" %>
+<%@ page import=3D"org.jahia.services.pages.JahiaPage" %>
=
<%
final HashMap engineMap =3D (HashMap) request.getAttribute("org.jahia.=
engines.EngineHashMap");
@@ -60,7 +62,10 @@
<% if ("categoryEdit".equals(engineName)) { %>
window.close();
window.opener.waitForClosePopup();
- <% } else { %>
+ <% } else if (PageProperties_Engine.ENGINE_NAME.equals(engineName)) {
+ JahiaPage thePage =3D (JahiaPage) engineMap.get("thePage");%>
+ CloseJahiaWindowWithUrl("<%=3DjParams.composePageUrl(thePage.g=
etID()) %>");
+ <% } else { %>
CloseJahiaWindow('<%=3DrefreshOpener%>');
<% } %>
<% } else { %>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
