inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged V3.2 to HEAD

Browse Source 
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
This commit is contained in:
Mike Hatfield
2010-01-26 12:44:37 +00:00
parent 8ec990c703
commit c3b50cb65a
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
source/java/org/alfresco/repo/forms/processor/node/ContentModelFormProcessor.java
View File

@@ -1299,6 +1299,7 @@ public abstract class ContentModelFormProcessor<ItemType, PersistType> extends
Map<QName, Serializable> propsToPersist, FormData data) Map<QName, Serializable> propsToPersist, FormData data)
{ {
ContentWriter writer = this.contentService.getWriter(nodeRef, ContentModel.PROP_CONTENT, true); ContentWriter writer = this.contentService.getWriter(nodeRef, ContentModel.PROP_CONTENT, true);
ContentData contentData = null;
if (writer != null) if (writer != null)
{ {
@@ -1312,7 +1313,7 @@ public abstract class ContentModelFormProcessor<ItemType, PersistType> extends
if (defaultMimetypeRequired) if (defaultMimetypeRequired)
{ {
// if the transient mimetype property has already set the mimetype don't do anything // 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) if (contentData != null)
{ {
String mimetype = contentData.getMimetype(); String mimetype = contentData.getMimetype();
@@ -1331,7 +1332,15 @@ public abstract class ContentModelFormProcessor<ItemType, PersistType> extends
} }
} }
}
else
{
contentData = (ContentData) this.nodeService.getProperty(nodeRef, ContentModel.PROP_CONTENT);
}
// add the potentially changed content data object back to property map for persistence // add the potentially changed content data object back to property map for persistence
if (contentData != null)
{
propsToPersist.put(ContentModel.PROP_CONTENT, contentData); propsToPersist.put(ContentModel.PROP_CONTENT, contentData);
} }
} }