Do not check for a comment review workflow when sending out a moderator email notification. This fixes http://dev.plone.org/plone/ticket/11444. Refs #11444
svn path=/plone.app.discussion/branches/1.x/; revision=47189
This commit is contained in:
parent
7dfd4ac98c
commit
de4353641b
@ -4,6 +4,10 @@ Changelog
|
||||
1.0 (2011-01-24)
|
||||
----------------
|
||||
|
||||
- Do not check for a comment review workflow when sending out a moderator email
|
||||
notification. This fixes http://dev.plone.org/plone/ticket/11444.
|
||||
[timo]
|
||||
|
||||
- Check if the current user has configured an e-mail address for the email
|
||||
notification option. This fixes http://dev.plone.org/plone/ticket/11428.
|
||||
[timo]
|
||||
|
@ -284,13 +284,6 @@ def notify_moderator(obj, event):
|
||||
if not settings.moderator_notification_enabled:
|
||||
return
|
||||
|
||||
# Check if the current workflow implements a pending state.
|
||||
wf_tool = getToolByName(obj, 'portal_workflow')
|
||||
comment_workflow = wf_tool.getChainForPortalType('Discussion Item')[0]
|
||||
comment_workflow = wf_tool[comment_workflow]
|
||||
if 'pending' not in comment_workflow.states:
|
||||
return
|
||||
|
||||
# Get informations that are necessary to send an email
|
||||
mail_host = getToolByName(obj, 'MailHost')
|
||||
portal_url = getToolByName(obj, 'portal_url')
|
||||
|
@ -256,18 +256,5 @@ class TestModeratorNotificationUnit(PloneTestCase):
|
||||
self.conversation.addComment(comment)
|
||||
self.assertEquals(len(self.mailhost.messages), 0)
|
||||
|
||||
def test_do_not_notify_moderator_when_moderation_workflow_is_disabled(self):
|
||||
# Disable comment moderation and make sure no email is send to the
|
||||
# moderator.
|
||||
self.portal.portal_types['Document'].allow_discussion = True
|
||||
self.portal.portal_workflow.setChainForPortalTypes(
|
||||
('Discussion Item',),
|
||||
('one_state_workflow',))
|
||||
|
||||
comment = createObject('plone.Comment')
|
||||
comment.text = 'Comment text'
|
||||
self.conversation.addComment(comment)
|
||||
self.assertEquals(len(self.mailhost.messages), 0)
|
||||
|
||||
def test_suite():
|
||||
return unittest.defaultTestLoader.loadTestsFromName(__name__)
|
||||
|
Loading…
Reference in New Issue
Block a user