Changeset 61

Show
Ignore:
Timestamp:
03/18/07 21:58:41 (2 years ago)
Author:
pragma
Message:

Fixed #21, #20, and #19

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/tracforums/models/forum.py

    r54 r61  
    155155         
    156156    def canModify(self,context): 
     157        print self.instance["moderatorsArr"] 
     158        print context.getAuthname() in self.instance["moderatorsArr"] 
    157159        # modifying a forum is restricted to: admin, moderators 
    158160        if context.isForumAdmin(): 
    …… 
    474476             
    475477        if len(forum['moderatorsArr']) > 0: 
    476             forum['moderators'] = ".".join(forum['moderatorsArr']) 
     478            forum['moderators'] = ",".join(forum['moderatorsArr']) 
    477479        else: 
    478480            forum['moderators'] = '' 

  • trunk/tracforums/templates/tracforums/forum/delete.cs

    r60 r61  
    2121    </p> 
    2222     
    23     <form method="post" action="<?cs var:trac.href.forums?>/forum/<?cs var:forums.forum.name?>"> 
     23    <form method="post" action="<?cs var:trac.href.forums?>/forum/"> 
     24        <input type="hidden" name="id" id='id' value="<?cs var:forums.forum.id?>"> 
    2425        <input type="hidden" name="uimode" id='uimode' value="deleted"> 
    2526        <input type="hidden" name="selectedTopics" id='selectedTopics' value="<?cs var:forums.selectedTopics?>"> 

  • trunk/tracforums/templates/tracforums/forum/deleted.cs

    r53 r61  
    1212     
    1313    <ul> 
    14         <li><a href='<?cs var:trac.href.forums?>/forum/<?cs var:forums.forum.name?>'>Return to the forum</a>.</li> 
     14        <li><a href='<?cs var:trac.href.forums?>/forum/<?cs var:forums.forum.id?>'>Return to the forum</a>.</li> 
    1515    </ul> 
    1616</div> 

  • trunk/tracforums/templates/tracforums/forum/moved.cs

    r33 r61  
    1212         
    1313    <ul> 
    14         <li><a href='<?cs var:trac.href.forums?>/forum/<?cs var:forums.targetForum.name?>'>View the destination forum.</a></li>     
    15         <li><a href='<?cs var:trac.href.forums?>/forum/<?cs var:forums.forum.name?>'>Return to this forum.</a></li> 
     14        <li><a href='<?cs var:trac.href.forums?>/forum/<?cs var:forums.targetForum.id?>'>View the destination forum.</a></li>     
     15        <li><a href='<?cs var:trac.href.forums?>/forum/<?cs var:forums.forum.id?>'>Return to this forum.</a></li> 
    1616    </ul> 
    1717</div> 

  • trunk/tracforums/templates/tracforums/macro/recenttopics.cs

    r55 r61  
    1414        <br> 
    1515        <div> 
    16             <?cs if:topic.replies > 0?>      
     16            <?cs if:topic.replies == 1?>         
     17                <a href='<?cs var:trac.href.forums?>/topic/<?cs var:topic.id?>'> 
     18                    1 Reply 
     19                </a> |  
     20            <?cs /if?>       
     21            <?cs if:topic.replies > 2?>      
    1722                <a href='<?cs var:trac.href.forums?>/topic/<?cs var:topic.id?>'> 
    1823                    <?cs var:topic.replies?> Replies 
    1924                </a> |  
    20             <?cs /if?>          
     25            <?cs /if?> 
    2126            <a href='<?cs var:trac.href.forums?>/message/?uimode=new&topicid=<?cs var:topic.id?>'> 
    2227                Add a Comment