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
This commit is contained in:
Kevin Roast
2008-03-11 14:01:39 +00:00
parent fe1770f616
commit abdf538b63

View File

@@ -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());
}
}
}
}