Changeset 379
- Timestamp:
- 07/06/06 04:44:47
- Files:
-
- qPloneComments/tags/2.0/__init__.py (modified) (2 diffs)
- qPloneComments/tags/2.0/patch.py (modified) (6 diffs)
- qPloneComments/tags/2.0/skins/qplonecomments/2.1/viewThreadsAtBottom.pt (modified) (1 diff)
- qPloneComments/tags/2.0/utils.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
qPloneComments/tags/2.0/__init__.py
r378 r379 1 1 from Products.CMFCore.DirectoryView import registerDirectory 2 from AccessControl import allow_module , Permission2 from AccessControl import allow_module 3 3 4 4 from config import * … … 10 10 allow_module('Products.qPloneComments.utils') 11 11 12 Permission.registerPermissions((('Moderate Discussion', (), ('Manager',)),))qPloneComments/tags/2.0/patch.py
r378 r379 3 3 from DateTime import DateTime 4 4 from Products.CMFCore.utils import getToolByName 5 from AccessControl import ClassSecurityInfo6 from Globals import InitializeClass7 5 8 6 from utils import * … … 47 45 ifModerate = getProp(self, "enable_moderation", marker=False) 48 46 if ifModerate: 49 roles = [role['name'] for role in self.acl_users.rolesOfPermission('Moderate Discussion') 50 if role['selected']== 'SELECTED'] 47 roles = ['DiscussionManager'] 51 48 item.manage_permission('Delete objects', roles, acquire=1) 52 49 item.manage_permission('View', roles, acquire=0) … … 54 51 item.review_state = "published" 55 52 56 item.__of__( self ).indexObject() 53 item.__of__( self ).indexObject() 57 54 return id 55 58 56 59 57 def getReplies( self ): … … 62 60 associated with this Discussable 63 61 """ 64 65 62 objects = [] 66 63 a = objects.append … … 69 66 result_ids = self._getReplyResults() 70 67 for id in result_ids: 71 object = self._container.get( id ).__of__( self ) 68 object = self._container.get( id ).__of__( self ) 72 69 try: 73 70 if validate(self, self, id, object): … … 77 74 return objects 78 75 79 s = repr(DiscussionItemContainer.__ac_permissions__)80 perms = DiscussionItemContainer.__ac_permissions__81 new_perms = []82 for item in perms:83 perm_name = item[0]84 funcs = item[1]85 if 'deleteReply' in funcs:86 new_perms.append( (perm_name, [f for f in funcs if f != 'deleteReply']) )87 new_perms.append( ('Moderate Discussion', ('deleteReply', )) )88 else:89 new_perms.append(item)90 DiscussionItemContainer.__ac_permissions__ = new_perms91 #raise s + '\n' + repr(DiscussionItemContainer.__ac_permissions__)92 93 InitializeClass(DiscussionItemContainer)94 76 95 77 DiscussionItemContainer.createReply = createReply qPloneComments/tags/2.0/skins/qplonecomments/2.1/viewThreadsAtBottom.pt
r378 r379 88 88 method="post" 89 89 style="display: inline;" 90 tal:condition="python:checkPermission('M oderate Discussion', here)"90 tal:condition="python:checkPermission('Manage portal', here)" 91 91 tal:attributes="action string:${reply/absolute_url}/deleteDiscussion"> 92 92 <input class="destructive" qPloneComments/tags/2.0/utils.py
r378 r379 66 66 return 1 67 67 68 68 69 69 def publishDiscussion(self): 70 70 roles = ['Anonymous']
