Author: xlawrence
Date: Wed Jun 27 16:28:28 2007
New Revision: 17800
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17800&repname=
=3Djahia
Log:
backport improvement and fixes on error display in workflow report
Modified:
trunk/core/src/webapp/jsp/jahia/engines/shared/close.jsp
Modified: trunk/core/src/webapp/jsp/jahia/engines/shared/close.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/webapp=
/jsp/jahia/engines/shared/close.jsp&rev=3D17800&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
--- trunk/core/src/webapp/jsp/jahia/engines/shared/close.jsp (original)
+++ trunk/core/src/webapp/jsp/jahia/engines/shared/close.jsp Wed Jun 27 16:=
28:28 2007
@@ -64,9 +64,21 @@
window.opener.waitForClosePopup();
<% } else if (PageProperties_Engine.ENGINE_NAME.equals(engineName)) {
JahiaPage thePage =3D (JahiaPage) engineMap.get("thePage");%>
+ if (window.opener.name.indexOf("workflow_showReport_") > -1) {
+ // We are currently returning to the workflow error report, so we =
do not want to refresh the
+ // underlying window.
+ window.close();
+ } else {
CloseJahiaWindowWithUrl("<%=3DjParams.composePageUrl(thePage.g=
etID()) %>");
+ }
<% } else { %>
+ if (window.opener.name.indexOf("workflow_showReport_") > -1) {
+ // We are currently returning to the workflow error report, so we =
do not want to refresh the
+ // underlying window.
+ window.close();
+ } else {
CloseJahiaWindow('<%=3DrefreshOpener%>');
+ }
<% } %>
<% } else { %>
<% ContentPage currentPage =3D jParams.getContentPage();
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
