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

Register IReplies adapters. Remove version.txt since we now get this from setup.py

Browse Source 
svn path=/plone.app.discussion/trunk/; revision=27011
This commit is contained in:
Martin Aspeli 2009-05-18 14:23:46 +00:00
parent 22ae84735b
commit f5a781501b
3 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plone/app/discussion/configure.zcml
View File

@ -33,6 +33,8 @@
<adapter factory=".conversation.conversationAdapterFactory" /> <adapter factory=".conversation.conversationAdapterFactory" />
<adapter factory=".conversation.ConversationReplies" />
<adapter factory=".conversation.CommentReplies" />
<!-- Event subscribers --> <!-- Event subscribers -->
<subscriber <subscriber

35
plone/app/discussion/conversation.py
View File

@ -20,7 +20,9 @@ from zope.annotation.interfaces import IAnnotations
from zope.event import notify from zope.event import notify
from Acquisition import aq_base
from Acquisition import Explicit from Acquisition import Explicit
from OFS.Traversable import Traversable from OFS.Traversable import Traversable
from OFS.event import ObjectWillBeAddedEvent from OFS.event import ObjectWillBeAddedEvent
@ -43,11 +45,10 @@ except ImportError:
from BTrees.OOBTree import OOBTree as LOBTree from BTrees.OOBTree import OOBTree as LOBTree
from BTrees.OOBTree import OOSet as LLSet from BTrees.OOBTree import OOSet as LLSet
from plone.app.discussion.interfaces import IConversation, IComment, IReplies from plone.app.discussion.interfaces import IConversation, IReplies
from plone.app.discussion.comment import Comment
from Acquisition import aq_base ANNOTATION_KEY = 'plone.app.discussion:conversation'
ANNO_KEY = 'plone.app.discussion:conversation'
class Conversation(Traversable, Persistent, Explicit): class Conversation(Traversable, Persistent, Explicit):
"""A conversation is a container for all comments on a content object. """A conversation is a container for all comments on a content object.
@ -212,11 +213,10 @@ def conversationAdapterFactory(content):
"""Adapter factory to fetch a conversation from annotations """Adapter factory to fetch a conversation from annotations
""" """
annotions = IAnnotations(content) annotions = IAnnotations(content)
if not ANNO_KEY in annotions: if not ANNOTATION_KEY in annotions:
conversation = Conversation() conversation = Conversation()
conversation._parent_uid = content.UID() annotions[ANNOTATION_KEY] = conversation
annotions[ANNO_KEY] = conversation conversation = annotions[ANNOTATION_KEY]
conversation = annotions[ANNO_KEY]
return conversation return conversation
class ConversationReplies(object): class ConversationReplies(object):
@ -298,15 +298,26 @@ class CommentReplies(ConversationReplies):
""" """
implements(IReplies) implements(IReplies)
adapts(IComment)
# depends on implementation details of conversation
# most likely, anyone writing a different type of Conversation will also
# have a different type of Comment
adapts(Comment)
def __init__(self, context): def __init__(self, context):
self.comment = context self.comment = context
self.comment_id = context.comment_id self.conversation = self.comment.__parent__
self.children = self.conversation._children.get(0, LLSet())
if self.conversation is None or not hasattr(self.conversation, '_children'):
raise TypeError("This adapter doesn't know what to do with the parent conversation")
self.comment_id = self.comment.comment_id
self.children = self.conversation._children.get(self.comment_id, LLSet())
def addComment(self, comment): def addComment(self, comment):
comment.in_reply_to = self.comment_id comment.in_reply_to = self.comment_id
return self.conversation.addComment(comment) return self.conversation.addComment(comment)
# Dict API is inherited # Dict API is inherited, written in terms of self.conversation and self.children

1
plone/app/discussion/version.txt
View File

@ -1 +0,0 @@
1.0a1