Changeset 226

Timestamp:

01/31/06 11:19:05

Author:

mylan

Message:

- Cleaned and equalized patch.py & utils.py with Plone 2.1.2 version
- Update moderation test.

Files:

• qPloneComments/trunk/patch.py (modified) (3 diffs)
• qPloneComments/trunk/tests/testQPloneCommentsModeration.py (modified) (1 diff)
• qPloneComments/trunk/utils.py (modified) (5 diffs)

qPloneComments/trunk/patch.py

@@ -1 @@
-from Products.CMFCore.CMFCorePermissions import View, ReviewPortalContent,DeleteObjects
-from Products.CMFDefault.DiscussionItem import DiscussionItemContainer, DiscussionItem
-from AccessControl import getSecurityManager, Unauthorized
@@ -47 +46 @@
-    if ifModerate:
-        roles = ['DiscussionManager']
-DeleteObjects
-ReviewPortalContent
-View
+'Delete objects'
+'Review portal content'
+'View'
-    else:
-        item.review_state = "published"
@@ -76 +75 @@
-    return objects
-
-
-
+
-DiscussionItemContainer.createReply = createReply
-DiscussionItemContainer.getReplies = getReplies

qPloneComments/trunk/tests/testQPloneCommentsModeration.py

@@ -149 +149 @@
-
-
-    def __testPublishing(self):
-        # Check whether perform real publishing
-        for u in DM_USERS_IDS:
-            doc_id = "doc_%s" % u
-            doc_obj = getattr(self.portal, doc_id)
-            getReplies = self.discussion.getDiscussionFor(doc_obj).getReplies
-            # Check whether anonymous get no reply
-            self.logout()
-            self.assert_(not getReplies(), "View not published reply ALLOW for Anonymous")
-            # Login with actual (tested) user with DiscussionManager role and publish discussion
-            self.login(u)
-            self.assert_(getReplies(), "%s - member of DiscussionManager group NOT VIEW not published reply" % u)
-            getReplies()[0].discussion_publish_comment()
-            # Check whether Anonym view published reply
-            self.logout()
-            self.assert_(getReplies(), "%s - member of DiscussionManager group NOT PUBLISH reply" % u)
-
-
-    def testPublishing(self):
-        # Check whether perform real publishing

qPloneComments/trunk/utils.py

@@ -1 +1 @@
-from Products.CMFCore.utils import getToolByName
-
-
+
-
-# Get apropriate property from (propery_sheeet) configlet
@@ -17 +16 @@
-def send_email(reply, context, state="approve"):
-    # Check is notification active
-    send_result = 0
-    notify = False
-    if state=="approve":
@@ -24 +22 @@
-        notify = getProp(context, "Enable_Published_Notification", False)
-    if not notify:
-send_result
+0
-
-    # Get parent object
@@ -63 +61 @@
-                           mfrom=from_address, organization_name=organization_name)
-        try:
- 
+
-            host.send( message )
-            send_result = 1
-        except:
-send_result =
-send_result
+return
+1
-
-        
@@ -81 +78 @@
-    portal = getToolByName(context, 'portal_url').getPortalObject()
-    if allow:
-ReplyToItem
+'Reply to item'
-    else:
-ReplyToItem
+'Reply to item'
-
-
+