From abdf538b634b723d1f85f9622be90e9c358b1bb0 Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Tue, 11 Mar 2008 14:01:39 +0000 Subject: [PATCH] Merged V2.2 to HEAD 8429: Merged V2.1 to V2.2 8387: Fix for WCM-1090 see ACT 1551 8421: Minor typo fix to OpenOffice document formats descriptions 8422: Fixed AR-2145: ContentStore cleaner was not watching out for VM shutdowns 8423: Removal of default root objects responsible git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@8510 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- source/java/org/alfresco/web/bean/wcm/SubmitDialog.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java b/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java index 655b7a068c..4ed60116e7 100644 --- a/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java +++ b/source/java/org/alfresco/web/bean/wcm/SubmitDialog.java @@ -1142,6 +1142,15 @@ public class SubmitDialog extends BaseDialogBean this.workflows.add(new FormWorkflowWrapper(defaultWfDef.getName(), fid.getForm().getDefaultWorkflowParameters())); } + + // See WCM-1090 ACT-1551 + // cannot depend on renditions of the form instance to contain the present + // node. Add it here if it hasn't been added by the above process. + if (!submittedPaths.contains(node.getPath())) + { + this.submitItems.add(new ItemWrapper(node)); + submittedPaths.add(node.getPath()); + } } } }