diff --git a/config/alfresco/script-services-context.xml b/config/alfresco/script-services-context.xml index e2dd88f352..a8d0f31031 100644 --- a/config/alfresco/script-services-context.xml +++ b/config/alfresco/script-services-context.xml @@ -258,6 +258,7 @@ + diff --git a/source/java/org/alfresco/repo/jscript/app/JSONConversionComponent.java b/source/java/org/alfresco/repo/jscript/app/JSONConversionComponent.java index 709ad1aba0..c7531f053d 100644 --- a/source/java/org/alfresco/repo/jscript/app/JSONConversionComponent.java +++ b/source/java/org/alfresco/repo/jscript/app/JSONConversionComponent.java @@ -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 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()); }