Changeset 3115 in products for quintagroup.plonecomments/trunk/quintagroup/plonecomments
- Timestamp:
- Apr 14, 2011 5:04:01 PM (13 years ago)
- Location:
- quintagroup.plonecomments/trunk/quintagroup/plonecomments
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
quintagroup.plonecomments/trunk/quintagroup/plonecomments/browser/comments.py
r3114 r3115 41 41 purl = getToolByName(self.context, 'portal_url') 42 42 mtool = getToolByName(self.context, 'portal_membership') 43 portrait_url = purl() + '/defaultUser.gif' 43 portrait_url = purl() + '/defaultUser.gif' 44 44 email = '' 45 45 … … 51 51 mem_id = getattr(member,'getId',lambda:'Anonymous User')() 52 52 portrait = mtool.getPersonalPortrait(mem_id) 53 portrait_url = 53 portrait_url = portrait.absolute_url() 54 54 else: 55 55 email = reply.getProperty('email',d='') … … 69 69 portal_properties = getToolByName(self.context, 'portal_properties') 70 70 prop_sheet = portal_properties['qPloneComments'] 71 value = 71 value = prop_sheet.getProperty('enable_authenticated_report_abuse', False) 72 72 return value 73 73 … … 76 76 portal_properties = getToolByName(self.context, 'portal_properties') 77 77 prop_sheet = portal_properties['qPloneComments'] 78 value = 78 value = prop_sheet.getProperty('enable_anonymous_report_abuse', False) 79 79 return value 80 80 … … 83 83 portal_properties = getToolByName(self.context, 'portal_properties') 84 84 prop_sheet = portal_properties['qPloneComments'] 85 value = 85 value = prop_sheet.getProperty('enable_ajax_report_abuse', False) 86 86 return value 87 87 … … 100 100 """ """ 101 101 return getToolByName(self.context, 'portal_url') 102 103 102 104 103 -
quintagroup.plonecomments/trunk/quintagroup/plonecomments/interfaces.py
r822 r3115 1 1 from plone.theme.interfaces import IDefaultPloneLayer 2 2 3 3 4 class IPloneCommentsLayer(IDefaultPloneLayer): -
quintagroup.plonecomments/trunk/quintagroup/plonecomments/patch.py
r3114 r3115 45 45 # Control of performing moderation 46 46 if getProp(self, 'enable_moderation', marker=False): 47 roles = [role['name'] for role in self.acl_users.rolesOfPermission('Moderate Discussion') 48 if role['selected'] == 'SELECTED'] 47 roles = [role['name'] 48 for role in self.acl_users.rolesOfPermission('Moderate Discussion') 49 if role['selected'] == 'SELECTED'] 49 50 roles.append('DiscussionManager') 50 51 item.manage_permission('Delete objects', roles, acquire=1) -
quintagroup.plonecomments/trunk/quintagroup/plonecomments/setuphandlers.py
r3114 r3115 44 44 logger = context.getLogger(LOGGER) 45 45 46 portal_conf =getToolByName(portal, 'portal_controlpanel')46 portal_conf = getToolByName(portal, 'portal_controlpanel') 47 47 portal_conf.unregisterConfiglet('prefs_comments_setup_form') 48 48 logger.info('Unregister configlet prefs_comments_setup_form. ') -
quintagroup.plonecomments/trunk/quintagroup/plonecomments/tests/common.py
r832 r3115 2 2 # Common constants and methods 3 3 # 4 from Products.CMFCore.utils import getToolByName 4 5 5 from Products.CMFCore.utils import getToolByName6 6 7 7 def addMembers(portal, users_map): … … 9 9 membership = getToolByName(portal, 'portal_membership', None) 10 10 for user_id in users_map.keys(): 11 membership.addMember(user_id, users_map[user_id]['passw'] , users_map[user_id]['roles'], [], 12 {'email': '%s@test.com'%user_id,}) 11 membership.addMember(user_id, users_map[user_id]['passw'], 12 users_map[user_id]['roles'], [], 13 {'email': '%s@test.com' % user_id,}) 14 13 15 14 16 def add2Group(portal, group, group_members): -
quintagroup.plonecomments/trunk/quintagroup/plonecomments/tests/config.py
r880 r3115 16 16 17 17 PERM_NAME = 'Moderate Discussion' 18 USERS = { # Common Members18 USERS = { # Common Members 19 19 'admin':{'passw': 'secret_admin', 'roles': ['Manager']}, 20 20 'owner':{'passw': 'secret_owner', 'roles': ['Owner']}, 21 21 'member':{'passw': 'secret_member', 'roles': ['Member']}, 22 22 'reviewer':{'passw': 'secret_reviewer', 'roles': ['Reviewer']}, 23 # Members for discussion manager group23 # Members for discussion manager group 24 24 'dm_admin':{'passw': 'secret_dm_admin', 'roles': ['Manager']}, 25 25 'dm_owner':{'passw': 'secret_dm_owner', 'roles': ['Owner']}, -
quintagroup.plonecomments/trunk/quintagroup/plonecomments/tests/testQPloneCommentsCommenting.py
r3114 r3115 73 73 "Anonymous user CAN'T really add comment in terned ON *Anonymous commenting mode*.") 74 74 75 75 76 def testAddCommentToDocNotAnonymUsers(self): 76 77 … … 176 177 self.illegal_common_users = [u for u in COMMON_USERS_IDS if not u in self.allowable_common_users] 177 178 178 179 179 def testAddCommentToNotPublishedReplyDMUsers(self): 180 180 -
quintagroup.plonecomments/trunk/quintagroup/plonecomments/tests/testQPloneCommentsConfiglet.py
r3114 r3115 78 78 "role NOT added" % actual_reply_permission) 79 79 # Simulate switching OFF Anonymous Commenting 80 if self.request.form.has_key('enable_anonymous_commenting'):81 del self.request.form['enable_anonymous_commenting']80 if 'enable_anonymous_commenting' in self.request.form: 81 del self.request.form['enable_anonymous_commenting'] 82 82 self.portal.prefs_comments_setup() 83 83 actual_reply_permission = getReplyRoles() -
quintagroup.plonecomments/trunk/quintagroup/plonecomments/tests/testQPloneCommentsInstall.py
r3112 r3115 33 33 'There is no %s folder in portal_skins.' % PRODUCT_SKIN_NAME) 34 34 for skin in skinstool.getSkinSelections(): 35 35 path = skinstool.getSkinPath(skin) 36 36 layers = map(str.strip, path.split(',')) 37 37 self.failUnless(PRODUCT_SKIN_NAME in layers, 38 38 '%s layer is not registered for %s.' % (PRODUCT_SKIN_NAME, skin)) 39 39 40 40 def test_layer_install(self): -
quintagroup.plonecomments/trunk/quintagroup/plonecomments/utils.py
r3114 r3115 44 44 props = filter(lambda x: prop_sheet.getProperty(x), prop_sheet.propertyIds()) 45 45 46 actions = { 'onPublish': ('enable_approve_user_notification', 47 'enable_reply_user_notification', 48 'enable_published_notification',), 49 'onDelete' : ('enable_rejected_user_notification',), 50 'onApprove': ('enable_approve_notification',), 51 'onAnonymousReportAbuse': ('enable_anonymous_report_abuse',), 52 'onAuthenticatedReportAbuse': ('enable_authenticated_report_abuse',),} 46 actions = { 47 'onPublish': ('enable_approve_user_notification', 48 'enable_reply_user_notification', 49 'enable_published_notification',), 50 'onDelete': ('enable_rejected_user_notification',), 51 'onApprove': ('enable_approve_notification',), 52 'onAnonymousReportAbuse': ('enable_anonymous_report_abuse',), 53 'onAuthenticatedReportAbuse': ('enable_authenticated_report_abuse',), 54 } 53 55 54 56 if action == 'publishing':
Note: See TracChangeset
for help on using the changeset viewer.