Changeset 794
- Timestamp:
- 02/22/07 10:10:42
- Files:
-
- qPloneComments/trunk/patch.py (modified) (1 diff)
- qPloneComments/trunk/tests/testQPloneCommentsNotification.py (modified) (1 diff)
- qPloneComments/trunk/utils.py (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
qPloneComments/trunk/patch.py
r793 r794 33 33 34 34 if pm.isAnonymousUser(): 35 userid = 'anonym' 36 else: 37 userid = pm.getAuthenticatedMember().getId() 38 39 item.manage_addProperty(id='userid', value=userid, type='string') 40 item.manage_addProperty(id='email', value=email, type='string') 35 item.manage_addProperty(id='email', value=email, type='string') 41 36 42 37 item.review_state="private" qPloneComments/trunk/tests/testQPloneCommentsNotification.py
r793 r794 68 68 69 69 prepareMailSendTest() 70 71 def test_bug_parent_reply(self): 72 setProperties(self.prefs, 'enable_reply_user_notification') 73 self.my_doc.discussion_reply('A Reply for my_doc' ,'text of reply for my_doc') 74 parent_reply = self.discussion.getDiscussionFor(self.my_doc).getReplies()[0] 75 parent_reply.discussion_reply('reply', 'text') 76 77 def test_bug_mistakable_names(self): 78 """ 79 cleanOutputDir() 80 setProperties(self.prefs, 'enable_reply_user_notification') 81 self.my_doc.discussion_reply('A Reply for my_doc' ,'text of reply for my_doc') 82 parent_reply = self.discussion.getDiscussionFor(self.my_doc).getReplies()[0] 83 84 parent_reply._delProperty('userid') 85 86 parent_reply.discussion_reply('reply', 'text') 87 """ 70 88 71 89 def test_notificafion_disabled(self): qPloneComments/trunk/utils.py
r793 r794 56 56 57 57 def getEmail(obj, context): 58 userid = obj.getProperty('userid', '')59 if userid == 'anonym':60 return obj.getProperty('email', '')58 email = obj.getProperty('email', None) 59 if not (email is None): 60 return email 61 61 else: 62 return context.portal_membership.getMemberById(userid).getProperty('email', '') 62 userid = obj.Creator() 63 creator = getToolByName(context, 'portal_membership').getMemberById(userid) 64 if creator: 65 return creator.getProperty('email', '') 66 return '' 63 67 64 68 def getParent(reply): … … 118 122 'obj': reply_parent, 119 123 'organization_name': organization_name, 120 'name': creator_name}124 'name': di_parrent.Creator()} 121 125 else: 122 126 args = {}
