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 HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud)

Browse Source 
59895: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3)
      59748: Merged DEV to V4.2-BUG-FIX (4.2.2)
         59567: MNT-10278: "Format" column is empty for Dublin Core View
            Implemented renderer for mymetype.
            Added mimetypeDisplayName property to JSON root values to be able to display human readable mimetype description without additional calls from JavaScript code.
            Added localized strings for unknown types in English and Russian languages.
            Edited dublin_core view sample to use mimetype instead of cm:mimetype.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62214 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-02-12 09:27:39 +00:00
parent bdff1bca64
commit ee70662f17
2 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/java/org/alfresco/repo/jscript/app/JSONConversionComponent.java
View File

@@ -36,6 +36,7 @@ import org.alfresco.service.cmr.model.FileFolderService;
import org.alfresco.service.cmr.model.FileInfo;
import org.alfresco.service.cmr.repository.ContentData;
import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.cmr.repository.MimetypeService;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.security.AccessPermission;
@@ -92,6 +93,7 @@ public class JSONConversionComponent
protected LockService lockService;
protected ContentService contentService;
protected PermissionService permissionService;
protected MimetypeService mimetypeService;
/**
@@ -157,6 +159,14 @@ public class JSONConversionComponent
{
this.contentService = contentService;
}
/**
* @param mimetypeService mimetype service
*/
public void setMimetypeService(MimetypeService mimetypeService)
{
this.mimetypeService = mimetypeService;
}
/**
* Register a property decorator;
@@ -251,6 +261,13 @@ public class JSONConversionComponent
rootJSONObject.put("contentURL", contentURL);
rootJSONObject.put("mimetype", cdata.getMimetype());
Map<String, String> mimetypeDescriptions;
mimetypeDescriptions = mimetypeService.getDisplaysByMimetype();
if (mimetypeDescriptions.containsKey(cdata.getMimetype()))
{
rootJSONObject.put("mimetypeDisplayName", mimetypeDescriptions.get(cdata.getMimetype()));
}
rootJSONObject.put("encoding", cdata.getEncoding());
rootJSONObject.put("size", cdata.getSize());
}