Changeset 2598 in products

Timestamp:

Jun 30, 2010 3:27:02 PM (15 years ago)

Author:

kroman0

Message:

Fixed problem with anonymous commenter and added display commenter email for moderator

Location:

quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/browser

Files:

• comments.pt (modified) (1 diff)
• comments.py (modified) (3 diffs)

quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/browser/comments.pt

@@ -37 +37 @@
                 <div class="documentByLine"
                      tal:define="creator reply/Creator;
-                                 anonymous_creator python:creator=='Anonymous User';
+                                 creator_email python:reply.getProperty('email','');
+                                 anonymous_creator python:creator=='Anonymous User' or creator_email;
                                  mi python:not anonymous_creator and view.member_info(creator);
                                  fullname python: mi and mi['fullname'] or creator;
                                  gavatar_src python:view.getGravatar(reply)" >
+                    <div>
+                        <span tal:content="creator">creator</span> 
+                        <span tal:condition="python:reply.hasProperty('email')" tal:content="python:reply.getProperty('email')">email</span>
+                    </div>
                     <img alt="Avatar" class="avatar" height="40" width="40"
                          src="http://default.gavatar.gif"
-                         tal:attributes="src gavatar_src">
+                         tal:attributes="src gavatar_src" />
                     <span i18n:translate="label_comment_by">Posted by</span>
                     <span tal:content="fullname"
                           tal:condition="not:anonymous_creator">Poster Name</span>
                     <span i18n:translate="label_anonymous_user"
-                          tal:condition="anonymous_creator">Anonymous User</span>
+                          tal:condition="python:not isModerationAllowed and anonymous_creator">Anonymous User</span>
+                    <span tal:condition="python:isModerationAllowed and anonymous_creator">
+                        <tal:creator tal:content="creator">User</tal:creator>
+                        <tal:isemail tal:condition="creator_email">(<tal:email tal:replace="creator_email">email</tal:email>)</tal:isemail>
+                    </span>
                     <span i18n:translate="label_commented_at">at</span>
                     <span tal:replace="python:view.format_time(reply.ModificationDate())">8/23/2001 12:40:44 PM</span>

quintagroup.plonecomments/branches/jquery/quintagroup/plonecomments/browser/comments.py

@@ -41 +41 @@
         mtool = getToolByName(self.context, 'portal_membership')
         portrait_url = purl() + '/defaultUser.gif'
-        email = ''
+        email = reply.getProperty('email', d='')
 
         creator = reply.Creator()
-        if creator and not creator == 'Anonymous User':
+        if creator and not creator == 'Anonymous User' and not email:
             mtool = getToolByName(self.context, "portal_membership")
             member = mtool.getMemberById(creator)
@@ -51 +51 @@
             portrait = mtool.getPersonalPortrait(mem_id)
             portrait_url = portrait.absolute_url()
-        else:
-            email = reply.getProperty('email', d='')
 
         if not email or not 'defaultUser.gif' in portrait_url:
@@ -61 +59 @@
         # construct the url
         gravatar_url += urllib.urlencode({
-            'gravatar_id': md5.md5(email).hexdigest(),
+            'gravatar_id': md5.md5(email.lower()).hexdigest(),
             'default': portrait_url,
             'size': str(size)})