ajung/plone.app.discussion
ajung/plone.app.discussion
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix that anonymous users see a link to a non-existent user-home in the comments viewlet.

Browse Source 
svn path=/plone.app.discussion/trunk/; revision=27419
This commit is contained in:
Timo Stollenwerk 2009-06-14 11:10:45 +00:00
parent 1670338ace
commit 5e26227ea1
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
plone/app/discussion/browser/comments.pt
View File

@ -29,21 +29,22 @@
tal:define="reply reply_dict/comment; tal:define="reply reply_dict/comment;
depth reply_dict/depth|python:0; depth reply_dict/depth|python:0;
creator reply/Creator; creator reply/Creator;
author_home_url string:${context/portal_url}/author/${reply/author_username}; author_home_url python:view.get_commenter_home_url(username=reply.author_username);
portrait python:here.portal_membership.getPersonalPortrait(reply.author_username); portrait_url python:view.get_commenter_portrait(reply.author_username);
anonymous_creator python:creator in ('Anonymous User', '');" anonymous_creator python:creator in ('Anonymous User', '');"
tal:attributes="class python:'comment replyTreeLevel'+str(depth); tal:attributes="class python:'comment replyTreeLevel'+str(depth);
style string:margin-left: ${depth}em; style string:margin-left: ${depth}em;
id string:comment-${reply/id}"> id string:comment-${reply/id}">
<div class="commentImage" tal:condition="showCommenterImage"> <div class="commentImage" tal:condition="showCommenterImage">
<a href="" tal:condition="not:isAnon" <a href="" tal:condition="not:isAnon"
tal:attributes="href author_home_url"> tal:attributes="href author_home_url">
<img src="defaultUser.gif" <img src="defaultUser.gif"
alt="" alt=""
border="0" border="0"
width="75" width="75"
tal:attributes="src portrait/absolute_url; tal:attributes="src portrait_url;
alt reply/creator" /> alt reply/creator" />
</a> </a>
<img src="defaultUser.gif" <img src="defaultUser.gif"
@ -51,7 +52,7 @@
border="0" border="0"
width="75" width="75"
tal:condition="isAnon" tal:condition="isAnon"
tal:attributes="src portrait/absolute_url; tal:attributes="src portrait_url;
alt reply/creator" /> alt reply/creator" />
</div> </div>

6
plone/app/discussion/browser/comments.py
View File

@ -100,9 +100,11 @@ class CommentsViewlet(ViewletBase):
def get_commenter_portrait(self, username): def get_commenter_portrait(self, username):
if username is None: if username is None:
return None # return the default user image if no username is given
return 'defaultUser.gif'
else: else:
return self.portal_membership.getPersonalPortrait(username); portal_membership = getToolByName(self.context, 'portal_membership', None)
return portal_membership.getPersonalPortrait(username).absolute_url();
def anonymous_discussion_allowed(self): def anonymous_discussion_allowed(self):
# Check if anonymous comments are allowed in the registry # Check if anonymous comments are allowed in the registry