Changeset 2917

Show
Ignore:
Timestamp:
12/18/07 03:54:34 (1 year ago)
Author:
Blackhex
Message:
  • Ported to Trac 0.11b1-r6336.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r2837 r2917  
    3434 
    3535        <div class="controls"> 
    36           <py:if test="'DISCUSSION_APPEND' in perm(context)"> 
     36          <py:if test="'DISCUSSION_APPEND' in perm"> 
    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_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> 
     39            <a py:if="('DISCUSSION_MODERATE' in perm 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> 
    …… 
    168168 
    169169        <div class="controls"> 
    170           <py:if test="'DISCUSSION_APPEND' in perm(context)"> 
     170          <py:if test="'DISCUSSION_APPEND' in perm"> 
    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_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> 
    174           </py:if> 
    175           <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> 
     173            <a py:if="('DISCUSSION_MODERATE' in perm and discussion.is_moderator) or ((discussion.authname == message.author) and (discussion.authname != 'anonymous'))" href="${href}?discussion_action=edit;message=${message.id}#reply">Edit</a> 
     174          </py:if> 
     175          <a py:if="'DISCUSSION_MODERATE' in perm 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> 
    176176        </div> 
    177177 

  • discussionplugin/0.11/tracdiscussion/templates/forum-list.html

    r2837 r2917  
    130130        </py:choose> 
    131131 
    132         <div py:if="'DISCUSSION_ADMIN' in perm(context)" class="buttons"> 
     132        <div py:if="'DISCUSSION_ADMIN' in perm" class="buttons"> 
    133133          <form method="post" action="${href.discussion()}"> 
    134134            <div> 

  • discussionplugin/0.11/tracdiscussion/templates/message-list.html

    r2353 r2917  
    2222        ${display_discussion(discussion, href.discussion(discussion.forum.id, discussion.topic.id))} 
    2323 
    24         <div py:if="'DISCUSSION_MODERATE' in perm(context) and discussion.is_moderator" class="buttons"> 
     24        <div py:if="'DISCUSSION_MODERATE' in perm and discussion.is_moderator" class="buttons"> 
    2525          <form method="post" action="${href.discussion(discussion.forum.id, discussion.topic.id)}"> 
    2626            <div> 

  • discussionplugin/0.11/tracdiscussion/templates/topic-list.html

    r2617 r2917  
    8888 
    8989        <div class="buttons"> 
    90           <form py:if="'DISCUSSION_APPEND' in perm(context)" method="post" action="${href.discussion(discussion.forum.id)}"> 
     90          <form py:if="'DISCUSSION_APPEND' in perm" method="post" action="${href.discussion(discussion.forum.id)}"> 
    9191            <div> 
    9292              <input type="submit" name="newtopic" value="New Topic"/> 
    …… 
    9595            </div> 
    9696          </form> 
    97           <form py:if="'DISCUSSION_ADMIN' in perm(context)" method="post" action="${href.discussion()}"> 
     97          <form py:if="'DISCUSSION_ADMIN' in perm" method="post" action="${href.discussion()}"> 
    9898            <div> 
    9999              <input type="submit" name="deleteforum" value="Delete Forum" onclick="return confirm('Do you realy want to delete this forum?')"/> 

  • discussionplugin/0.11/tracdiscussion/templates/wiki-message-list.html

    r2365 r2917  
    33  <div id="${discussion.mode}" class="${discussion.mode}"> 
    44    <py:choose> 
    5       <py:when test="'DISCUSSION_VIEW' in perm(context) and discussion.topic"> 
     5      <py:when test="'DISCUSSION_VIEW' in perm and discussion.topic"> 
    66        <xi:include href="wiki-discussion-header.html"/> 
    77        ${display_discussion(discussion, href.wiki(discussion.page_name))} 
    88        <xi:include href="wiki-discussion-footer.html"/> 
    99      </py:when> 
    10       <py:when test="'DISCUSSION_VIEW' in perm(context) and not discussion.topic"> 
     10      <py:when test="'DISCUSSION_VIEW' in perm and not discussion.topic"> 
    1111        <xi:include href="wiki-discussion-header.html"/> 
    1212        <xi:include href="wiki-discussion-missing.html"/>