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

ALF-11844 WikiService needs to set the mimetype of html on the content property created through it

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@32869 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Nick Burch
2011-12-20 03:50:44 +00:00
parent 503b6c2016
commit 2413f55253
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/java/org/alfresco/repo/wiki/WikiServiceImpl.java
View File

@@ -33,6 +33,7 @@ import org.alfresco.query.CannedQuerySortDetails;
import org.alfresco.query.EmptyPagingResults; import org.alfresco.query.EmptyPagingResults;
import org.alfresco.query.PagingRequest; import org.alfresco.query.PagingRequest;
import org.alfresco.query.PagingResults; import org.alfresco.query.PagingResults;
import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.domain.node.NodeDAO; import org.alfresco.repo.domain.node.NodeDAO;
import org.alfresco.repo.node.getchildren.GetChildrenAuditableCannedQuery; import org.alfresco.repo.node.getchildren.GetChildrenAuditableCannedQuery;
import org.alfresco.repo.node.getchildren.GetChildrenAuditableCannedQueryFactory; import org.alfresco.repo.node.getchildren.GetChildrenAuditableCannedQueryFactory;
@@ -224,6 +225,7 @@ public class WikiServiceImpl implements WikiService
// Store the content // Store the content
ContentWriter writer = contentService.getWriter(nodeRef, ContentModel.PROP_CONTENT, true); ContentWriter writer = contentService.getWriter(nodeRef, ContentModel.PROP_CONTENT, true);
writer.setMimetype(MimetypeMap.MIMETYPE_HTML);
writer.setEncoding("UTF-8"); writer.setEncoding("UTF-8");
writer.putContent(content); writer.putContent(content);
@@ -263,6 +265,7 @@ public class WikiServiceImpl implements WikiService
// Change the content // Change the content
ContentWriter writer = contentService.getWriter(nodeRef, ContentModel.PROP_CONTENT, true); ContentWriter writer = contentService.getWriter(nodeRef, ContentModel.PROP_CONTENT, true);
writer.setMimetype(MimetypeMap.MIMETYPE_HTML);
writer.setEncoding("UTF-8"); writer.setEncoding("UTF-8");
writer.putContent(page.getContents()); writer.putContent(page.getContents());

12
source/java/org/alfresco/repo/wiki/WikiServiceImplTest.java
View File

@@ -30,12 +30,15 @@ import java.util.List;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.query.PagingRequest; import org.alfresco.query.PagingRequest;
import org.alfresco.query.PagingResults; import org.alfresco.query.PagingResults;
import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.policy.BehaviourFilter; import org.alfresco.repo.policy.BehaviourFilter;
import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.site.SiteModel; import org.alfresco.repo.site.SiteModel;
import org.alfresco.repo.transaction.RetryingTransactionHelper; import org.alfresco.repo.transaction.RetryingTransactionHelper;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.service.cmr.dictionary.DictionaryService; import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.repository.ContentReader;
import org.alfresco.service.cmr.repository.ContentService;
import org.alfresco.service.cmr.repository.NodeRef; import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService; import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.security.MutableAuthenticationService; import org.alfresco.service.cmr.security.MutableAuthenticationService;
@@ -74,6 +77,7 @@ public class WikiServiceImplTest
private static MutableAuthenticationService AUTHENTICATION_SERVICE; private static MutableAuthenticationService AUTHENTICATION_SERVICE;
private static BehaviourFilter BEHAVIOUR_FILTER; private static BehaviourFilter BEHAVIOUR_FILTER;
private static WikiService WIKI_SERVICE; private static WikiService WIKI_SERVICE;
private static ContentService CONTENT_SERVICE;
private static DictionaryService DICTIONARY_SERVICE; private static DictionaryService DICTIONARY_SERVICE;
private static NodeService NODE_SERVICE; private static NodeService NODE_SERVICE;
private static NodeService PUBLIC_NODE_SERVICE; private static NodeService PUBLIC_NODE_SERVICE;
@@ -104,6 +108,7 @@ public class WikiServiceImplTest
AUTHENTICATION_SERVICE = (MutableAuthenticationService)testContext.getBean("authenticationService"); AUTHENTICATION_SERVICE = (MutableAuthenticationService)testContext.getBean("authenticationService");
BEHAVIOUR_FILTER = (BehaviourFilter)testContext.getBean("policyBehaviourFilter"); BEHAVIOUR_FILTER = (BehaviourFilter)testContext.getBean("policyBehaviourFilter");
WIKI_SERVICE = (WikiService)testContext.getBean("WikiService"); WIKI_SERVICE = (WikiService)testContext.getBean("WikiService");
CONTENT_SERVICE = (ContentService)testContext.getBean("ContentService");
DICTIONARY_SERVICE = (DictionaryService)testContext.getBean("dictionaryService"); DICTIONARY_SERVICE = (DictionaryService)testContext.getBean("dictionaryService");
NODE_SERVICE = (NodeService)testContext.getBean("nodeService"); NODE_SERVICE = (NodeService)testContext.getBean("nodeService");
PUBLIC_NODE_SERVICE = (NodeService)testContext.getBean("NodeService"); PUBLIC_NODE_SERVICE = (NodeService)testContext.getBean("NodeService");
@@ -153,6 +158,13 @@ public class WikiServiceImplTest
NodeRef site = NODE_SERVICE.getPrimaryParent(container).getParentRef(); NodeRef site = NODE_SERVICE.getPrimaryParent(container).getParentRef();
assertEquals(WIKI_SITE.getNodeRef(), site); assertEquals(WIKI_SITE.getNodeRef(), site);
// Ensure the content was correctly set up
ContentReader reader = CONTENT_SERVICE.getReader(page.getNodeRef(), ContentModel.PROP_CONTENT);
assertEquals("This Is Some Content", reader.getContentString());
assertEquals(MimetypeMap.MIMETYPE_HTML, reader.getMimetype());
assertEquals("UTF-8", reader.getEncoding());
// Check the details on the object // Check the details on the object
assertEquals("Title", page.getTitle()); assertEquals("Title", page.getTitle());