From c3b50cb65aeaa04d35f23a3766c9bd66f33ce5b3 Mon Sep 17 00:00:00 2001 From: Mike Hatfield Date: Tue, 26 Jan 2010 12:44:37 +0000 Subject: [PATCH] Merged V3.2 to HEAD 18226: Repository DocLib. New Folder moved to Forms. Upload fixed & refactored. Default Share forms moved from Commons to Share. Inline Edit. Ability to anchor to arbitrary nodeRef. 18248: ETHREEOH-4007 - "Failed to load data for folder details" error appears at View Details page for series, categories, folders 18249: Add default port to URL in sample config 18250: Fix for inline edit not saving updated content 18251: SAIL-94 - Add WebDAV & CIFS URLs to the details page "Share" section (WebDAV only) 18253: SAIL-99 - New Tag filter with text box (adds tag to bottom of list) 18256: Minor issues around Inline Edit reported internally. Also tidied version webscript. 18259: ETHREEOH-4023 - It's impossible to upload content 18282: ETHREEOH-3932: if choose any Record Type except "Default"- Failure upload File 18284: Repo DocLib: WebDAV url fix. View in Explorer action. Product version added to client-side JavaScript requests (to help with stale-version caching issues). rootNode config element renamed to root-node 18293: ETHREEOH-4038 - Repo Doclib delete from document details and folder details fails ETHREEOH-4039 - Repo Doclib - Message dialog when deleting using 'selected items' does not have title or message body strings ETHREEOH-4040 - Repo Doclib - Multiselect delete failure git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18299 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../processor/node/ContentModelFormProcessor.java | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/source/java/org/alfresco/repo/forms/processor/node/ContentModelFormProcessor.java b/source/java/org/alfresco/repo/forms/processor/node/ContentModelFormProcessor.java index 6ba096959f..ae1d8ae1ba 100644 --- a/source/java/org/alfresco/repo/forms/processor/node/ContentModelFormProcessor.java +++ b/source/java/org/alfresco/repo/forms/processor/node/ContentModelFormProcessor.java @@ -1299,6 +1299,7 @@ public abstract class ContentModelFormProcessor extends Map propsToPersist, FormData data) { ContentWriter writer = this.contentService.getWriter(nodeRef, ContentModel.PROP_CONTENT, true); + ContentData contentData = null; if (writer != null) { @@ -1312,7 +1313,7 @@ public abstract class ContentModelFormProcessor extends if (defaultMimetypeRequired) { // if the transient mimetype property has already set the mimetype don't do anything - ContentData contentData = (ContentData) propsToPersist.get(ContentModel.PROP_CONTENT); + contentData = (ContentData) propsToPersist.get(ContentModel.PROP_CONTENT); if (contentData != null) { String mimetype = contentData.getMimetype(); @@ -1331,8 +1332,16 @@ public abstract class ContentModelFormProcessor extends } } - // add the potentially changed content data object back to property map for persistence - propsToPersist.put(ContentModel.PROP_CONTENT, contentData); + } + else + { + contentData = (ContentData) this.nodeService.getProperty(nodeRef, ContentModel.PROP_CONTENT); + } + + // add the potentially changed content data object back to property map for persistence + if (contentData != null) + { + propsToPersist.put(ContentModel.PROP_CONTENT, contentData); } } }