ajung/plone.app.discussion
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move some policy out of the conversation storage adapter into a view,

Browse Source 
specifically "enabled()".  Prevents having to replace/migrate
persistent objects to change policy which really only concerns the
context and possibly the request, not the conversation storage. Fixes
#11372.

svn path=/plone.app.discussion/trunk/; revision=48849
This commit is contained in:
Ross Patterson
2011-04-15 04:29:46 +00:00
parent 7354ca4298
commit 3708429a37
8 changed files with 146 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plone/app/discussion/tests/test_comments_viewlet.py
+10
View File
@@ -7,6 +7,7 @@ from AccessControl import Unauthorized
from OFS.Image import Image
from zope import interface
from zope.interface import alsoProvides
from zope.publisher.browser import TestRequest
from zope.annotation.interfaces import IAttributeAnnotatable
@@ -29,6 +30,7 @@ from Products.PloneTestCase.ptc import PloneTestCase
from plone.app.discussion.browser.comments import CommentsViewlet
from plone.app.discussion.browser.comments import CommentForm
from plone.app.discussion import interfaces
from plone.app.discussion.interfaces import IConversation
from plone.app.discussion.tests.layer import DiscussionLayer
from plone.app.discussion.interfaces import IDiscussionSettings
@@ -39,6 +41,9 @@ class TestCommentForm(PloneTestCase):
layer = DiscussionLayer
def afterSetUp(self):
interface.alsoProvides(
self.portal.REQUEST, interfaces.IDiscussionLayer)
self.loginAsPortalOwner()
typetool = self.portal.portal_types
typetool.constructContent('Document', self.portal, 'doc1')
@@ -111,6 +116,8 @@ class TestCommentForm(PloneTestCase):
settings = registry.forInterface(IDiscussionSettings, check=False)
settings.anonymous_comments = True
self.portal.portal_workflow.doActionFor(self.context, 'publish')
# Logout
self.logout()
@@ -211,6 +218,9 @@ class TestCommentsViewlet(PloneTestCase):
layer = DiscussionLayer
def afterSetUp(self):
interface.alsoProvides(
self.portal.REQUEST, interfaces.IDiscussionLayer)
self.loginAsPortalOwner()
typetool = self.portal.portal_types
typetool.constructContent('Document', self.portal, 'doc1')
plone/app/discussion/tests/test_conversation.py
+16 -8
View File
@@ -1,6 +1,7 @@
import unittest
from datetime import datetime, timedelta
from zope import interface
from zope.component import createObject, queryUtility
from zope.annotation.interfaces import IAnnotations
@@ -14,6 +15,7 @@ from Products.CMFCore.utils import getToolByName
from Products.PloneTestCase.ptc import PloneTestCase
from plone.app.discussion.tests.layer import DiscussionLayer
from plone.app.discussion import interfaces
from plone.app.discussion.interfaces import IConversation
from plone.app.discussion.interfaces import IComment
from plone.app.discussion.interfaces import IReplies
@@ -25,6 +27,9 @@ class ConversationTest(PloneTestCase):
layer = DiscussionLayer
def afterSetUp(self):
interface.alsoProvides(
self.portal.REQUEST, interfaces.IDiscussionLayer)
# First we need to create some content.
self.loginAsPortalOwner()
typetool = self.portal.portal_types
@@ -244,7 +249,7 @@ class ConversationTest(PloneTestCase):
self.assertFalse(aq_base(folder).allow_discussion)
doc = self.portal.folder1.doc2
conversation = IConversation(doc)
conversation = doc.restrictedTraverse('@@conversation_view')
self.assertEquals(conversation.enabled(), False)
# We have to allow discussion on Document content type, since
@@ -258,7 +263,8 @@ class ConversationTest(PloneTestCase):
def test_disable_commenting_globally(self):
# Create a conversation.
conversation = IConversation(self.portal.doc1)
conversation = self.portal.doc1.restrictedTraverse(
'@@conversation_view')
# We have to allow discussion on Document content type, since
# otherwise allow_discussion will always return False
@@ -286,7 +292,7 @@ class ConversationTest(PloneTestCase):
self.typetool.constructContent('News Item', self.portal, 'newsitem')
newsitem = self.portal.newsitem
conversation = IConversation(newsitem)
conversation = newsitem.restrictedTraverse('@@conversation_view')
# We have to allow discussion on Document content type, since
# otherwise allow_discussion will always return False
@@ -312,7 +318,8 @@ class ConversationTest(PloneTestCase):
def test_disable_commenting_for_content_type(self):
# Create a conversation.
conversation = IConversation(self.portal.doc1)
conversation = self.portal.doc1.restrictedTraverse(
'@@conversation_view')
# The Document content type is disabled by default
self.assertEquals(conversation.enabled(), False)
@@ -337,11 +344,11 @@ class ConversationTest(PloneTestCase):
# The enabled method should always return False for the folder
# itself.
# Create a folder
# Create a folderp
self.typetool.constructContent('Folder', self.portal, 'f1')
f1 = self.portal.f1
# Usually we don't create a conversation on a folder
conversation = IConversation(self.portal.f1)
conversation = self.portal.f1.restrictedTraverse('@@conversation_view')
# Allow discussion for the folder
self.portal_discussion.overrideDiscussionFor(f1, True)
@@ -369,7 +376,7 @@ class ConversationTest(PloneTestCase):
# Create a document inside the folder
self.typetool.constructContent('Document', f1, 'doc1')
doc1 = self.portal.f1.doc1
doc1_conversation = IConversation(doc1)
doc1_conversation = doc1.restrictedTraverse('@@conversation_view')
self.assertEquals(doc1_conversation.enabled(), False)
@@ -389,7 +396,8 @@ class ConversationTest(PloneTestCase):
# Allow discussion on a single content object
# Create a conversation.
conversation = IConversation(self.portal.doc1)
conversation = self.portal.doc1.restrictedTraverse(
'@@conversation_view')
# Discussion is disallowed by default
self.assertEquals(conversation.enabled(), False)