Author: xlawrence
Date: Mon Sep 3 10:15:25 2007
New Revision: 18352
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D18352&repname=
=3Djahia
Log:
resolve issue http://www.jahia.net/jira/browse/JAHIA-2155: Sp3 Workflow: cl=
ose of workflow warning pop-up reloads the full workflow tree + relock all =
content objects
Only reload the tree if the user clicked on a link in the report page, mean=
ing that he attempted to correct the error
Modified:
branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/workflow=
/showReport.jsp
Modified: branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/wo=
rkflow/showReport.jsp
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/branches/JAHIA-5-0-SP=
-BRANCH/core/src/webapp/jsp/jahia/engines/workflow/showReport.jsp&rev=3D183=
52&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/jsp/jahia/engines/workflow=
/showReport.jsp (original)
+++ branches/JAHIA-5-0-SP-BRANCH/core/src/webapp/jsp/jahia/engines/workflow=
/showReport.jsp Mon Sep 3 10:15:25 2007
@@ -69,7 +69,7 @@
if (obj !=3D null /* && obj.checkWriteAccess(jParams.getUser()=
) */) {
if (ivfar.getObjectType().equals(ContentFieldKey.FIELD_TYP=
E)) {
buff.append("[<b>");
- buff.append("<a href=3D\"javascript:");
+ buff.append("<a onclick=3D\"window.onunload=3DrefreshT=
ree;\" href=3D\"javascript:");
buff.append(jData.gui().html().drawUpdateFieldLauncher=
((ContentField) obj));
buff.append("\">");
buff.append(ivfar.getObjectType()).append(" ").append(=
ivfar.getObjectID());
@@ -78,7 +78,7 @@
=
} else if (ivfar.getObjectType().equals(ContentContainerKe=
y.CONTAINER_TYPE)) {
buff.append("[<b>");
- buff.append("<a href=3D\"javascript:");
+ buff.append("<a onclick=3D\"window.onunload=3DrefreshT=
ree;\" href=3D\"javascript:");
buff.append(jData.gui().html().drawUpdateContainerLaun=
cher((ContentContainer) obj));
buff.append("\">");
buff.append(ivfar.getObjectType()).append(" ").append(=
ivfar.getObjectID());
@@ -87,7 +87,7 @@
=
} else if (ivfar.getObjectType().equals(ContentPageKey.PAG=
E_TYPE)) {
buff.append("[<b>");
- buff.append("<a href=3D\"javascript:");
+ buff.append("<a onclick=3D\"window.onunload=3DrefreshT=
ree;\" href=3D\"javascript:");
buff.append(jData.gui().html().drawPagePropertiesLaunc=
her((ContentPage) obj));
buff.append("\">");
buff.append(ivfar.getObjectType()).append(" ").append(=
ivfar.getObjectID());
@@ -120,7 +120,10 @@
%>
=
<script type=3D"text/javascript">
- window.onunload =3D function () {
+
+ window.onunload =3D null;
+
+ function refreshTree() {
window.opener.refreshTree();
}
</script>
@@ -132,7 +135,7 @@
=
<div id=3D"buttons">
<div class=3D"button">
- <a href=3D"javascript:window.opener.refreshTree();window.close();"
+ <a href=3D"javascript:window.close();"
title=3D"<jahia:engineResourceBundle resourceName=3D"org.jahia.=
close.button"/>">
<jahia:engineResourceBundle resourceName=3D"org.jahia.close.bu=
tton"/>
</a>
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
