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

hide author_notification field if author notification is disabled. save author notification setting properly when saving the form.

Browse Source 
svn path=/plone.app.discussion/branches/notification/; revision=34475
This commit is contained in:
Timo Stollenwerk 2010-03-03 19:17:13 +00:00
parent b293d3aa50
commit ff0270dac7
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,11 +76,10 @@ class CommentForm(extensible.ExtensibleForm, form.Form):
self.widgets['author_email'].mode = interfaces.HIDDEN_MODE self.widgets['author_email'].mode = interfaces.HIDDEN_MODE
# Notification enabled # Notification enabled
# XXX: Not working! ComponentLookupError registry = queryUtility(IRegistry)
#registry = queryUtility(IRegistry) settings = registry.forInterface(IDiscussionSettings)
#settings = registry.forInterface(IDiscussionSettings) if not settings.user_notification_enabled:
#if not settings.notification_enabled: self.widgets['author_notification'].mode = interfaces.HIDDEN_MODE
# self.widgets['author_notification'].mode = interfaces.HIDDEN_MODE
def updateActions(self): def updateActions(self):
super(CommentForm, self).updateActions() super(CommentForm, self).updateActions()
@ -124,7 +123,9 @@ class CommentForm(extensible.ExtensibleForm, form.Form):
author_username = data['author_username'] author_username = data['author_username']
if 'author_email' in data: if 'author_email' in data:
author_email = data['author_email'] author_email = data['author_email']
if 'author_notification' in data:
author_notification = data['author_notification']
# The add-comment view is called on the conversation object # The add-comment view is called on the conversation object
conversation = IConversation(self.__parent__) conversation = IConversation(self.__parent__)
@ -144,6 +145,7 @@ class CommentForm(extensible.ExtensibleForm, form.Form):
comment.creator = author_name comment.creator = author_name
comment.author_name = author_name comment.author_name = author_name
comment.author_email = author_email comment.author_email = author_email
comment.author_notification = author_notification
comment.creation_date = comment.modification_date = datetime.now() comment.creation_date = comment.modification_date = datetime.now()
else: else:
member = portal_membership.getAuthenticatedMember() member = portal_membership.getAuthenticatedMember()
@ -155,6 +157,7 @@ class CommentForm(extensible.ExtensibleForm, form.Form):
comment.author_username = member.getUserName() comment.author_username = member.getUserName()
comment.author_name = member.getProperty('fullname') comment.author_name = member.getProperty('fullname')
comment.author_email = member.getProperty('email') comment.author_email = member.getProperty('email')
comment.author_notification = comment.author_notification
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 # Check if the added comment is a reply to an existing comment