diff --git a/source/java/org/alfresco/web/bean/wcm/AVMNode.java b/source/java/org/alfresco/web/bean/wcm/AVMNode.java index 3b13c5fc8a..f4a827c2f6 100644 --- a/source/java/org/alfresco/web/bean/wcm/AVMNode.java +++ b/source/java/org/alfresco/web/bean/wcm/AVMNode.java @@ -218,6 +218,7 @@ public class AVMNode extends Node implements Map this.properties.put("modified", this.avmRef.getModDate()); this.properties.put("creator", this.avmRef.getCreator()); this.properties.put("modifier", this.avmRef.getLastModifier()); + this.properties.put("deleted", this.deleted); this.propsRetrieved = true; } diff --git a/source/web/jsp/wcm/manage-review-task-dialog.jsp b/source/web/jsp/wcm/manage-review-task-dialog.jsp index 70bdc4312e..d4c93ba16f 100644 --- a/source/web/jsp/wcm/manage-review-task-dialog.jsp +++ b/source/web/jsp/wcm/manage-review-task-dialog.jsp @@ -66,10 +66,15 @@ - + + + + - + + diff --git a/source/web/jsp/wcm/submit-dialog.jsp b/source/web/jsp/wcm/submit-dialog.jsp index bf7acb0201..b5b4494fad 100644 --- a/source/web/jsp/wcm/submit-dialog.jsp +++ b/source/web/jsp/wcm/submit-dialog.jsp @@ -40,6 +40,7 @@ { document.getElementById("dialog:dialog-body:comment").focus(); noItems = document.getElementById("dialog:finish-button").disabled; + document.getElementById("dialog:finish-button").onclick = showProgress; checkButtonState(); } @@ -59,7 +60,15 @@ } } + function showProgress() + { + document.getElementById('progress').style.display = 'block'; + } + + + href="#{r.previewUrl}" target="new" rendered="#{!r.deleted}" />