Changeset 2656

Show
Ignore:
Timestamp:
09/23/07 14:48:17 (1 year ago)
Author:
Blackhex
Message:
  • Fixed missfunctional display of new replies count in forum list.
  • Fixed empty messages bodies display.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • discussionplugin/0.11/tracdiscussion/notification.py

    r2365 r2656  
    99 
    1010from genshi.template import TemplateLoader, TextTemplate 
    11  
    1211 
    1312class DiscussionNotifyEmail(NotifyEmail): 

  • discussionplugin/0.11/tracdiscussion/templates/discussion-macros.html

    r2619 r2656  
    3737            <a href="${href}?discussion_action=add;message=-1;#reply">Reply</a> 
    3838            <a href="${href}?discussion_action=quote;message=-1;#reply">Quote</a> 
    39             <a py:if="discussion.is_moderator or ((discussion.authname == discussion.topic.author) and (discussion.authname != 'anonymous'))" href="${href}?discussion_action=edit;#reply">Edit</a> 
     39            <a py:if="('DISCUSSION_MODERATE' in perm(context) and discussion.is_moderator) or ((discussion.authname == discussion.topic.author) and (discussion.authname != 'anonymous'))" href="${href}?discussion_action=edit;#reply">Edit</a> 
    4040          </py:if> 
    4141        </div> 
    …… 
    171171            <a href="${href}?discussion_action=add;message=${message.id}#reply">Reply</a> 
    172172            <a href="${href}?discussion_action=quote;message=${message.id}#reply">Quote</a> 
    173             <a py:if="discussion.is_moderator or ((discussion.authname == message.author) and (discussion.authname != 'anonymous'))" href="${href}?discussion_action=edit;message=${message.id}#reply">Edit</a> 
     173            <a py:if="('DISCUSSION_MODERATE' in perm(context) and discussion.is_moderator) or ((discussion.authname == message.author) and (discussion.authname != 'anonymous'))" href="${href}?discussion_action=edit;message=${message.id}#reply">Edit</a> 
    174174          </py:if> 
    175175          <a py:if="'DISCUSSION_MODERATE' in perm(context) and discussion.is_moderator" href="${href}?discussion_action=delete;message=${message.id}" onclick="return confirm('Do you realy want to delete this reply and all its descendants?')">Delete</a> 

  • discussionplugin/0.11/tracdiscussion/templates/discussion-notify-body.txt

    r2353 r2656  
    1010-- 
    1111${discussion.title} URL: <${discussion.link}> 
    12 ${project_name} <${project_url}> 
    13 ${project_descr} 
     12${discussion.project_name} <${discussion.project_url}> 
     13${discussion.project_description}