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

Unless Discussion Item has an workflow, moderation is not enabled

Browse Source 
svn path=/plone.app.discussion/trunk/; revision=49135
This commit is contained in:
Erico Andrei 2011-04-27 17:41:07 +00:00
parent 3a224784b0
commit 1a751b495f
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
plone/app/discussion/browser/moderation.py
View File

@ -39,12 +39,14 @@ class View(BrowserView):
""" """
context = aq_inner(self.context) context = aq_inner(self.context)
workflowTool = getToolByName(context, 'portal_workflow') workflowTool = getToolByName(context, 'portal_workflow')
comment_workflow = workflowTool.getChainForPortalType('Discussion Item')[0] comment_workflow = workflowTool.getChainForPortalType('Discussion Item')
comment_workflow = workflowTool[comment_workflow] if comment_workflow:
if 'pending' in comment_workflow.states: comment_workflow = comment_workflow[0]
return True comment_workflow = workflowTool[comment_workflow]
else: if 'pending' in comment_workflow.states:
return False return True
else:
return
class ModerateCommentsEnabled(BrowserView): class ModerateCommentsEnabled(BrowserView):
@ -56,12 +58,14 @@ class ModerateCommentsEnabled(BrowserView):
""" """
context = aq_inner(self.context) context = aq_inner(self.context)
workflowTool = getToolByName(context, 'portal_workflow', None) workflowTool = getToolByName(context, 'portal_workflow', None)
comment_workflow = workflowTool.getChainForPortalType('Discussion Item')[0] comment_workflow = workflowTool.getChainForPortalType('Discussion Item')
comment_workflow = workflowTool[comment_workflow] if comment_workflow:
if 'pending' in comment_workflow.states: comment_workflow = comment_workflow[0]
return True comment_workflow = workflowTool[comment_workflow]
else: if 'pending' in comment_workflow.states:
return return True
else:
return
class DeleteComment(BrowserView): class DeleteComment(BrowserView):

4
plone/app/discussion/tests/test_moderation_view.py
View File

@ -47,6 +47,9 @@ class ModerationViewTest(unittest.TestCase):
"""Make sure that moderation_enabled returns true if the comment """Make sure that moderation_enabled returns true if the comment
workflow implements a 'pending' state. workflow implements a 'pending' state.
""" """
# If workflow is not set, enabled must return False
self.wf_tool.setChainForPortalTypes(('Discussion Item',),())
self.assertEqual(self.view.moderation_enabled(), False)
# The one_state_workflow does not have a 'pending' state # The one_state_workflow does not have a 'pending' state
self.wf_tool.setChainForPortalTypes(('Discussion Item',), self.wf_tool.setChainForPortalTypes(('Discussion Item',),
('one_state_workflow,')) ('one_state_workflow,'))
@ -77,7 +80,6 @@ class ModerationViewTest(unittest.TestCase):
self.assertTrue('No comments to moderate' in view) self.assertTrue('No comments to moderate' in view)
self.assertEqual(len(self.view.comments), 0) self.assertEqual(len(self.view.comments), 0)
class ModerationBulkActionsViewTest(unittest.TestCase): class ModerationBulkActionsViewTest(unittest.TestCase):
layer = PLONE_APP_DISCUSSION_INTEGRATION_TESTING layer = PLONE_APP_DISCUSSION_INTEGRATION_TESTING