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 BRANCHES/DEV/BELARUS/HEAD-2011_10_05 to HEAD:

Browse Source 
31291: ALF-9460 : Archived discussion posts break display of the discussed node when users do not have access to the trash can




git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@31303 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Matt Ward
2011-10-18 08:42:09 +00:00
parent 1964bde460
commit efdda5d864
2 changed files with 58 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/alfresco/model/forumModel.xml
View File

@@ -33,6 +33,7 @@
<type name="fm:post"> <type name="fm:post">
<parent>cm:content</parent> <parent>cm:content</parent>
<archive>false</archive>
</type> </type>
</types> </types>

57
source/java/org/alfresco/repo/discussion/DiscussionServiceImplTest.java
View File

@@ -41,6 +41,7 @@ import org.alfresco.service.cmr.discussion.DiscussionService;
import org.alfresco.service.cmr.discussion.PostInfo; import org.alfresco.service.cmr.discussion.PostInfo;
import org.alfresco.service.cmr.discussion.PostWithReplies; import org.alfresco.service.cmr.discussion.PostWithReplies;
import org.alfresco.service.cmr.discussion.TopicInfo; import org.alfresco.service.cmr.discussion.TopicInfo;
import org.alfresco.service.cmr.repository.AssociationRef;
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;
@@ -1639,6 +1640,62 @@ public class DiscussionServiceImplTest
} }
} }
/**
* Tests that "fm:post" content is not archived.
*/
@Test public void alf_9460()
{
TopicInfo siteTopic;
TopicInfo nodeTopic;
PostInfo post;
PostInfo reply;
// Nothing to start with
PagingResults<TopicInfo> results =
DISCUSSION_SERVICE.listTopics(DISCUSSION_SITE.getShortName(), true, new PagingRequest(10));
assertEquals(0, results.getPage().size());
results = DISCUSSION_SERVICE.listTopics(FORUM_NODE, true, new PagingRequest(10));
assertEquals(0, results.getPage().size());
// Create two topics, one node and one site based
siteTopic = DISCUSSION_SERVICE.createTopic(DISCUSSION_SITE.getShortName(), "Site Title");
nodeTopic = DISCUSSION_SERVICE.createTopic(FORUM_NODE, "Node Title");
testNodesToTidy.add(siteTopic.getNodeRef());
testNodesToTidy.add(nodeTopic.getNodeRef());
for (TopicInfo topic : new TopicInfo[] {siteTopic, nodeTopic})
{
// Create the first post
String contents = "This Is Some Content";
post = DISCUSSION_SERVICE.createPost(topic, contents);
// Add a reply
String reply1Contents = "Reply Contents";
reply = DISCUSSION_SERVICE.createReply(post, reply1Contents);
List<AssociationRef> assocs = NODE_SERVICE.getTargetAssocs(reply.getNodeRef(), ContentModel.ASSOC_REFERENCES);
// check that reply has an association with original post
assertNotNull(assocs);
assertEquals(1, assocs.size());
assertEquals(post.getNodeRef(), assocs.get(0).getTargetRef());
// delete the original post
DISCUSSION_SERVICE.deletePost(post);
// check that post was deleted
assertFalse(NODE_SERVICE.exists(post.getNodeRef()));
// check that associations to the original post was also deleted
assocs = NODE_SERVICE.getTargetAssocs(reply.getNodeRef(), ContentModel.ASSOC_REFERENCES);
assertNotNull(assocs);
assertEquals(0, assocs.size());
}
}
// -------------------------------------------------------------------------------- // --------------------------------------------------------------------------------