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

fix redirect after a comment has been posted. 

svn path=/plone.app.discussion/trunk/; revision=31000
This commit is contained in:
Timo Stollenwerk 2009-11-01 09:24:27 +00:00
parent 94adf62566
commit ae2767daec
1 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
plone/app/discussion/browser/comments.py
View File

@ -122,11 +122,8 @@ class CommentForm(extensible.ExtensibleForm, form.Form):
@button.buttonAndHandler(_(u"Comment")) @button.buttonAndHandler(_(u"Comment"))
def handleComment(self, action): def handleComment(self, action):
context = aq_inner(self.context) context = aq_inner(self.context)
wf = getToolByName(context, 'portal_workflow') wf = getToolByName(context, 'portal_workflow')
data, errors = self.extractData() data, errors = self.extractData()
title = u"" title = u""
@ -135,14 +132,13 @@ class CommentForm(extensible.ExtensibleForm, form.Form):
author_username = u"" author_username = u""
author_email = u"" author_email = u""
# Captcha check (only when captcha is enabled and user is anonymous) # Captcha check for anonymous users (if Captcha is enabled)
registry = queryUtility(IRegistry) registry = queryUtility(IRegistry)
settings = registry.forInterface(IDiscussionSettings) settings = registry.forInterface(IDiscussionSettings)
portal_membership = getToolByName(self.context, 'portal_membership') portal_membership = getToolByName(self.context, 'portal_membership')
if settings.captcha != 'disabled' and portal_membership.isAnonymousUser(): if settings.captcha != 'disabled' and portal_membership.isAnonymousUser():
# Check captcha only if it is not disabled
if 'captcha' in data: if 'captcha' in data:
# Check captcha only if there is a value, otherwise # Check Captcha only if there is a value, otherwise
# the default "required" validator is sufficient. # the default "required" validator is sufficient.
captcha = CaptchaValidator(self.context, self.request, None, ICaptcha['captcha'], None) captcha = CaptchaValidator(self.context, self.request, None, ICaptcha['captcha'], None)
captcha.validate(data['captcha']) captcha.validate(data['captcha'])
@ -150,7 +146,6 @@ class CommentForm(extensible.ExtensibleForm, form.Form):
return return
if 'title' in data and 'text' in data: if 'title' in data and 'text' in data:
title = data['title'] title = data['title']
text = data['text'] text = data['text']
@ -193,29 +188,29 @@ class CommentForm(extensible.ExtensibleForm, form.Form):
comment.author_email = member.getProperty('email') comment.author_email = member.getProperty('email')
comment.creation_date = comment.modification_date = datetime.now() comment.creation_date = comment.modification_date = datetime.now()
# Check if the added comment is a reply to an existing comment
# or just a regular reply to the content object.
if data['in_reply_to']: if data['in_reply_to']:
# Add the reply to the comment # Add a reply to an existing comment
comment_id = replies.addComment(comment) comment_id = replies.addComment(comment)
else: else:
# Add comment to the conversation # Add a comment to the conversation
comment_id = conversation.addComment(comment) comment_id = conversation.addComment(comment)
can_manage = getSecurityManager().checkPermission('Manage portal', aq_inner(self.context)) # If a user post a comment and moderation is enabled, a message is shown
# to the user that his/her comment awaits moderation. If the user has manage
# Show info message when comment moderation is enabled # right, he/she is redirected directly to the comment.
can_manage = getSecurityManager().checkPermission('Manage portal', context)
if wf.getChainForPortalType('Discussion Item') == \ if wf.getChainForPortalType('Discussion Item') == \
('comment_review_workflow',) and not can_manage: ('comment_review_workflow',) and not can_manage:
# Show info message when comment moderation is enabled
IStatusMessage(self.context.REQUEST).addStatusMessage( IStatusMessage(self.context.REQUEST).addStatusMessage(
_("Your comment awaits moderator approval."), _("Your comment awaits moderator approval."),
type="info") type="info")
self.request.response.redirect( self.request.response.redirect(context.absolute_url())
aq_parent(aq_inner(self.context)).absolute_url())
else: else:
# Redirect to comment (inside a content object page) # Redirect to comment (inside a content object page)
self.request.response.redirect( self.request.response.redirect(context.absolute_url() + '#' + str(comment_id))
aq_parent(aq_inner(self.context)).absolute_url() + \
'#' + str(comment_id))
@button.buttonAndHandler(_(u"Cancel")) @button.buttonAndHandler(_(u"Cancel"))
def handleCancel(self, action): def handleCancel(self, action):