Changeset 2236

Show
Ignore:
Timestamp:
05/15/07 07:41:37 (2 years ago)
Author:
Blackhex
Message:

DiscussionPlugin:

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • discussionplugin/0.10/tracdiscussion/db/db2.py

    r1252 r2236  
    3737 
    3838    # Set database schema version. 
    39     cursor.execute("DROP TABLE forum_old") 
    4039    cursor.execute("UPDATE system SET value = '2' WHERE" \ 
    4140      " name = 'discussion_version'") 

  • discussionplugin/0.10/tracdiscussion/templates/discussion-macros.cs

    r2014 r2236  
    107107      </div> 
    108108      <div class="body"> 
    109         <?cs if:(args.message == message.id) && args.preview ?> 
    110           <?cs var:discussion.body ?> 
    111         <?cs else?> 
    112           <?cs var:message.body ?> 
    113         <?cs /if ?> 
     109        <?cs var:message.body ?> 
    114110      </div> 
    115111      <div class="controls"> 

  • discussionplugin/0.10/tracdiscussion/templates/message-list.cs

    r2014 r2236  
    33<?cs linclude "discussion-header.cs" ?> 
    44 
    5 <h1>Forum #<?cs var:discussion.forum.id ?> - Topic #<?cs var:discussion.topic.id ?> - Message List</h1> 
     5<h1><?cs var:discussion.forum.name ?> (#<?cs var:discussion.forum.id ?>) - <?cs var:discussion.topic.subject ?> (#<?cs var:discussion.topic.id ?>) - Message List</h1> 
    66<?cs set:discussion.href = discussion.href + '/' + discussion.forum.id + '/' + discussion.topic.id ?> 
    77<?cs call:display_discussion(discussion) ?> 

  • discussionplugin/0.10/tracdiscussion/templates/topic-list.cs

    r2014 r2236  
    44<?cs include "discussion-header.cs" ?> 
    55 
    6 <h1>Forum #<?cs var:discussion.forum.id ?> - Topic List</h1> 
    7 <div class="name"> 
    8   <?cs var:discussion.forum.name ?> 
    9 </div> 
    10 <div class="description"> 
    11   <?cs var:discussion.forum.description ?> 
    12 </div> 
     6<h1><?cs var:discussion.forum.name ?> (#<?cs var:discussion.forum.id ?>) - Topic List</h1> 
     7<h2><?cs var:discussion.forum.subject ?></h2> 
     8<p><?cs var:discussion.forum.description ?></p> 
    139<?cs if:discussion.topics.0.id ?> 
    1410  <table class="listing"> 

  • discussionplugin/0.10/tracdiscussion/wiki.py

    r2014 r2236  
    106106            columns = ('forum', 'forum_subject', 'subject') 
    107107            sql = "SELECT t.forum, f.subject, t.subject FROM topic t LEFT" \ 
    108               " JOIN (SELECT subject, id FROM forum GROUP BY id) f ON" \ 
    109               " t.forum = f.id WHERE t.id = %s" 
     108              " JOIN forum f ON t.forum = f.id WHERE t.id = %s" 
    110109            self.log.debug(sql % (id,)) 
    111110            cursor.execute(sql, (id,)) 
    …… 
    120119            columns = ('forum', 'topic', 'forum_subject', 'subject') 
    121120            sql = "SELECT m.forum, m.topic, f.subject, t.subject FROM" \ 
    122               " message m, (SELECT subject, id FROM forum GROUP BY id) f," \ 
    123               " (SELECT subject, id FROM topic GROUP BY id) t WHERE" \ 
     121              " message m, (SELECT subject, id FROM forum) f," \ 
     122              " (SELECT subject, id FROM topic) t WHERE" \ 
    124123              " m.forum = f.id AND m.topic = t.id AND m.id = %s" 
    125124            self.log.debug(sql % (id,))