Changeset 375

Timestamp:

07/05/06 12:32:21

Author:

crchemist

Message:

Added 'Moderate Discussion' permission.

Files:

• qPloneComments/trunk/Extensions/Install.py (modified) (previous)
• qPloneComments/trunk/__init__.py (modified) (2 diffs)
• qPloneComments/trunk/patch.py (modified) (6 diffs)
• qPloneComments/trunk/skins/qplonecomments/2.0.5/viewThreadsAtBottom.pt (modified) (1 diff)
• qPloneComments/trunk/skins/qplonecomments/2.1/viewThreadsAtBottom.pt (modified) (1 diff)
• qPloneComments/trunk/skins/qplonecomments/prefs_comments_setup.cpy (modified) (2 diffs)
• qPloneComments/trunk/skins/qplonecomments/prefs_comments_setup_form.cpt (modified) (2 diffs)
• qPloneComments/trunk/tests/testQPloneCommentsPermission.py (added)
• qPloneComments/trunk/utils.py (modified) (1 diff)
• qPloneComments/trunk/version.txt (modified) (1 diff)

qPloneComments/trunk/__init__.py

@@ -1 +1 @@
-from Products.CMFCore.DirectoryView import registerDirectory
-
+, Permission
-
-from  config import *
@@ -10 +10 @@
-allow_module('Products.qPloneComments.utils')
-
+Permission.registerPermissions((('Moderate Discussion', (), ('Manager',)),))

qPloneComments/trunk/patch.py

@@ -3 +3 @@
-from DateTime import DateTime
-from Products.CMFCore.utils import getToolByName
+from AccessControl import ClassSecurityInfo
+from Globals import InitializeClass
-
-from utils import *
@@ -45 +47 @@
-    ifModerate = getProp(self, "enable_moderation", marker=False)
-    if ifModerate:
-
+
+
-        item.manage_permission('Delete objects', roles, acquire=1)
-        item.manage_permission('View', roles, acquire=0)
@@ -51 +54 @@
-        item.review_state = "published"
-
-        
+
-    return id
-
-
-def getReplies( self ):
@@ -60 +62 @@
-        associated with this Discussable
-    """
+
-    objects = []
-    a = objects.append
@@ -66 +69 @@
-    result_ids = self._getReplyResults()
-    for id in result_ids:
- 
+
-        try:
-            if validate(self, self, id, object):
@@ -74 +77 @@
-    return objects
-
+s = repr(DiscussionItemContainer.__ac_permissions__)
+perms = DiscussionItemContainer.__ac_permissions__
+new_perms = []
+for item in perms:
+    perm_name = item[0]
+    funcs = item[1]
+    if 'deleteReply' in funcs:
+        new_perms.append( (perm_name, [f for f in funcs if f != 'deleteReply']) )
+        new_perms.append( ('Moderate Discussion', ('deleteReply', )) )
+    else:
+        new_perms.append(item)
+DiscussionItemContainer.__ac_permissions__ = new_perms
+#raise s + '\n' + repr(DiscussionItemContainer.__ac_permissions__)
+
+InitializeClass(DiscussionItemContainer)
-
-DiscussionItemContainer.createReply = createReply

qPloneComments/trunk/skins/qplonecomments/2.0.5/viewThreadsAtBottom.pt

@@ -95 +95 @@
-                          method="post"
-                          style="display: inline;"
-anage portal
+oderate Discussion
-                          tal:attributes="action string:${reply/absolute_url}/deleteDiscussion">
-

qPloneComments/trunk/skins/qplonecomments/2.1/viewThreadsAtBottom.pt

@@ -88 +88 @@
-                          method="post"
-                          style="display: inline;"
-anage portal
+oderate Discussion
-                          tal:attributes="action string:${reply/absolute_url}/deleteDiscussion">
-                        <input class="destructive"

qPloneComments/trunk/skins/qplonecomments/prefs_comments_setup.cpy

@@ -10 +10 @@
-from Products.CMFCore.utils import getToolByName
-from Products.qPloneComments.utils import setAnonymCommenting
-
+
-form = context.REQUEST.form
-pp = getToolByName(context, 'portal_properties')
@@ -37 +37 @@
-props_sheet.manage_changeProperties(kw)
-
+moderate_discussion = 'Moderate Discussion'
+if not 'EnableManagerModeration' in request_ids:
+    roles = [item['name'] for item in context.rolesOfPermission(moderate_discussion)
+             if (item['name'] != 'Manager') and (item['selected'] == 'SELECTED')]
+    context.manage_permission(moderate_discussion, roles,  acquire=0)
+
+else:
+    roles = [item['name'] for item in context.rolesOfPermission(moderate_discussion)
+             if item['selected'] == 'SELECTED']
+    roles.append('Manager')
+    context.manage_permission(moderate_discussion, roles,  acquire=0)
+    
+
-return state.set(portal_status_message='qPloneComments configuration changes saved.')

qPloneComments/trunk/skins/qplonecomments/prefs_comments_setup_form.cpt

@@ -127 +127 @@
-                                           tabindex tabindex/next;"/>
-
- 
+
-                           for="isEnableApproveNotification">Enable Discussion Manager notification on new comments.</label>
+                </div>
+
+                <div class="field"
+                     tal:define="isEnabledManagerModeration python:checkPermission('Moderate Discussion', here);">
+
+                    <input type="checkbox" 
+                           class="noborder"
+                           name="EnableManagerModeration"
+                           id="EnableManagerModeration"
+                           tabindex =""
+                           tal:attributes="value isEnabledManagerModeration;
+                                           checked python:test(isEnabledManagerModeration, 'True', '');
+                                           tabindex tabindex/next;"/>
+
+                    <label i18n:translate="enable_manager_moderation"
+                           for="isEnableApproveNotification">Enable Manager moderation.</label>
-                </div>
-
@@ -137 +153 @@
-                     tal:attributes="class python:test(error, 'field error', 'field')"
-                     tal:condition="python:props_sheet.hasProperty(property_id)">
-
+
-                    <label i18n:translate="label_discussion-manager_email">Send comments notification emails to:</label>
-
+
-                    <div class="formHelp" id="smtp_server_help"
-                         i18n:translate="help_discussion-manager_email">

qPloneComments/trunk/utils.py

@@ -66 +66 @@
-    return 1
-
-
+
-def publishDiscussion(self):
-    roles = ['Anonymous']

qPloneComments/trunk/version.txt

@@ -1 @@
-0
+2