Changeset 2403 in products

Timestamp:

May 28, 2010 3:56:24 PM (14 years ago)

Author:

wald

Message:

custom changes for lwb.org.ua website

Location:

quintagroup.plonecomments/branches/wald/quintagroup/plonecomments/browser

Files:

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

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

@@ -40 +40 @@
                          src="http://default.gavatar.gif"
                          tal:attributes="src gavatar_src">
-                    <span i18n:translate="label_comment_by">Posted by</span>
+                    <!-- 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>
-                    <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>
+                    <!--span i18n:translate="label_commented_at">at</span-->
+                    <span tal:replace="python:toLocalizedTime(reply.ModificationDate(), long_format=1)">8/23/2001 12:40:44 PM</span>
                     <span tal:condition="python:ifModerate and not isPublished">[pending]</span>
                 </div>

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

@@ -37 +37 @@
         purl = getToolByName(self.context, 'portal_url')
         mtool = getToolByName(self.context, 'portal_membership')            
-        portrait_url = purl() + '/defaultUser.gif' 
+        default = purl() + '/defaultUser.gif' 
         email = ''
 
@@ -44 +44 @@
             mtool = getToolByName(self.context, "portal_membership")
             member = mtool.getMemberById(creator)
+            #portrait = mtool.getPersonalPortrait(member.getId())
+            #portrait_url =  portrait.absolute_url()
             email = member and member.getProperty('email','') or ''
-            portrait = mtool.getPersonalPortrait(memberId)
-            portrait_url =  portrait.absolute_url()
         else:
             email = reply.getProperty('email',d='')
+        if not email:
+            return default
 
-        if not email:
-            return portrait_url
+        try:
+            memberId = member.getId()
+            portrait = mtool.getPersonalPortrait(member.getId())
+            portrait_url =  portrait.absolute_url()
+        except:
+            memberId = 'Anonimous User'
+                    
 
-        size = 40
-        gravatar_url = "http://www.gravatar.com/avatar.php?"
-        # construct the url
-        gravatar_url += urllib.urlencode({'gravatar_id':md5.md5(email).hexdigest(),
-            'default':portrait_url, 'size':str(size)})
-        return gravatar_url
+        murl = '/portal_memberdata/portraits/'
+        murl = purl() + murl + memberId
+        
+        if portrait_url == murl:
+            return portrait_url             
+        else: 
+            size = 40
+            gravatar_url = "http://www.gravatar.com/avatar.php?"
+            # construct the url
+            gravatar_url += urllib.urlencode({'gravatar_id':md5.md5(email).hexdigest(),
+                'default':default, 'size':str(size)})
+            return gravatar_url