Changeset 909

Timestamp:

06/18/06 10:43:50 (3 years ago)

Author:

Blackhex

Message:

DiscussionPlugin:

• ViewTopic? macro implementaton.
  
• Missing time in topic and message preview fix.
  
• Some code reorganization.
  

Files:

• discussionplugin/0.9/setup.py (modified) (1 diff)
• discussionplugin/0.9/tracdiscussion/admin.py (modified) (1 diff)
• discussionplugin/0.9/tracdiscussion/api.py (added)
• discussionplugin/0.9/tracdiscussion/core.py (modified) (17 diffs)
• discussionplugin/0.9/tracdiscussion/templates/forum-add.cs (modified) (2 diffs)
• discussionplugin/0.9/tracdiscussion/templates/forum-admin.cs (modified) (3 diffs)
• discussionplugin/0.9/tracdiscussion/templates/forum-list.cs (modified) (3 diffs)
• discussionplugin/0.9/tracdiscussion/templates/group-admin.cs (modified) (2 diffs)
• discussionplugin/0.9/tracdiscussion/templates/message-list.cs (modified) (9 diffs)
• discussionplugin/0.9/tracdiscussion/templates/topic-add.cs (modified) (3 diffs)
• discussionplugin/0.9/tracdiscussion/templates/topic-list.cs (modified) (2 diffs)
• discussionplugin/0.9/tracdiscussion/wiki.py (modified) (4 diffs)

discussionplugin/0.9/setup.py

@@ -6 +6 @@
-setup(
-  name = 'TracDiscussion',
-2
+3
-  packages = ['tracdiscussion', 'tracdiscussion.db'],
-  package_data = {'tracdiscussion' : ['templates/*.cs', 'htdocs/css/*.css']},

discussionplugin/0.9/tracdiscussion/admin.py

@@ -31 +31 @@
-        add_stylesheet(req, 'discussion/css/admin.css')
-
-        action = None
-
-        # Get action
-
-
-
-
+
-
-        # Determine mode

discussionplugin/0.9/tracdiscussion/core.py

@@ +1 @@
+from tracdiscussion.api import *
-from trac.core import *
-from trac.web.chrome import INavigationContributor, ITemplateProvider, add_stylesheet
-from trac.web.main import IRequestHandler
-from trac.wiki import wiki_to_html, wiki_to_oneliner
-from trac.perm import IPermissionRequestor, PermissionError
-, pretty_timedelta
+
-import re, os, time
-
@@ -33 +33 @@
-
-    def get_navigation_items(self, req):
-
-
-
-
-
+
+
+
+
-
-    # IRequestHandler methods
@@ -63 +62 @@
-        add_stylesheet(req, 'common/css/wiki.css')
-        add_stylesheet(req, 'discussion/css/discussion.css')
-
-
-
-
+
+
-
-        # Get action
-
-
-
-
+
+
-        preview = req.args.has_key('preview');
-        submit = req.args.has_key('submit');
@@ -79 +74 @@
-        # Populate active forum
-        if req.args.has_key('forum'):
-
+
+
-            if not forum:
-                raise TracError('No such forum %s' % req.args.get('forum'))
@@ -89 +85 @@
-        # Populate active topic
-        if req.args.has_key('topic'):
-
+
+
-            if not topic:
-                raise TracError('No such topic %s' % req.args.get('topic'))
@@ -95 +92 @@
-        # Populate active topic
-        if req.args.has_key('message'):
-
+
+
-            if not message:
-                raise TracError('No such message %s' % req.args.get('message'))
@@ -150 +148 @@
-        if mode == 'forum-list':
-            req.perm.assert_permission('DISCUSSION_VIEW')
-
+
+
+
+
+
-        elif mode == 'forum-add':
-            req.perm.assert_permission('DISCUSSION_MODIFY')
-
+
+
+
+
-        elif mode == 'forum-post-add':
-            req.perm.assert_permission('DISCUSSION_MODIFY')
@@ -170 +175 @@
-
-            # Add new forum
-self.add_forum(cursor
+add_forum(cursor, self.log
-              moderators, group)
-
-            # Display forum list
-
+
+
+
+
+
-            mode = 'forum-list'
-        elif mode == 'forum-delete':
@@ -180 +189 @@
-
-            # Delete current forum
-self.delete_forum(cursor
+delete_forum(cursor, self.log
-
-            # Display forum list
-
+
+
+
+
+
-            mode = 'forum-list'
-
@@ -189 +202 @@
-        elif mode == 'topic-list':
-            req.perm.assert_permission('DISCUSSION_VIEW')
-
-
+
+
+
-        elif mode == 'topic-add':
-            req.perm.assert_permission('DISCUSSION_VIEW')
@@ -201 +215 @@
-            body = req.args.get('body')
-
+            req.hdf['discussion.href'] = self.env.href.discussion(forum['id'])
-            if author:
-                req.hdf['discussion.author'] = wiki_to_oneliner(author, self.env)
-            if body:
-                req.hdf['discussion.body'] = wiki_to_html(body, self.env, req)
+            req.hdf['discussion.time'] = format_datetime(time.time())
-        elif mode == 'topic-post-add':
-            req.perm.assert_permission('DISCUSSION_VIEW')
@@ -214 +230 @@
-
-            # Add new topic and display topic list
-
-
-
+
+
+
+
-            mode = 'topic-list'
-        elif mode == 'topic-delete':
@@ -225 +242 @@
-                raise PermissionError('Forum moderate')
-
-message
-self.delete_topic(cursor, forum['id']
+topic
+delete_topic(cursor, self.log
-
-            # Display topics
-
-
+
+
+
-            mode = 'topic-list'
-
@@ -245 +263 @@
-
-            # Display messages
+            req.hdf['discussion.href'] = self.env.href.discussion(forum['id'],
+              topic['id'])
-            if author:
-                req.hdf['discussion.author'] = wiki_to_oneliner(author, self.env)
-            if body:
-                req.hdf['discussion.body'] = wiki_to_html(body, self.env, req)
-
-
+
+
+
-        elif mode == 'message-post-add':
-            req.perm.assert_permission('DISCUSSION_VIEW')
@@ -259 +280 @@
-
-            # Add new message
-self.add_message(cursor, forum['id'], topic['id'], reply, author
-
+add_message(cursor, self.log, forum['id'], topic['id'], reply
+author, 
-
-            # Display messages
+            req.hdf['discussion.href'] = self.env.href.discussion(forum['id'],
+              topic['id'])
-            if author:
-                req.hdf['discussion.author'] = wiki_to_oneliner(author, self.env)
-            if body:
-                req.hdf['discussion.body'] = wiki_to_html(body, self.env, req)
-self.get_messages(cursor
-
+get_messages(cursor, self.env
+self.log, 
-            mode = 'message-list'
-        elif mode == 'message-delete':
@@ -278 +301 @@
-
-            # Delete message
-self.delete_message(cursor, forum['id'], topic['id']
+delete_message(cursor, self.log
-
-            # Display or messages
-messages'] = self.get_messages(cursor, req
+href'] = self.env.href.discussion(forum['id']
-              topic['id'])
+            req.hdf['discussion.messages'] = get_messages(cursor, self.env, req,
+              self.log, topic['id'])
-            mode = 'message-list'
-
-discussion.groups'] = self.get_groups(cursor, req);
+trac.href.discussion'] = self.env.href.discussion()
-        req.hdf['discussion.forum'] = forum
-        req.hdf['discussion.topic'] = topic
@@ -293 +318 @@
-        db.commit()
-        return mode + '.cs', None
-
-    # Non-extension methods
-    def get_message(self, cursor, req, id):
-        columns = ('id', 'forum', 'topic', 'replyto', 'time', 'author', 'body')
-        sql = 'SELECT id, forum, topic, replyto, time, author, body FROM' \
-          ' message WHERE id = %s' % (id)
-        self.log.debug(sql)
-        cursor.execute(sql)
-        for row in cursor:
-            row = dict(zip(columns, row))
-            row['author'] = wiki_to_oneliner(row['author'], self.env)
-            row['body'] = wiki_to_html(row['body'], self.env, req)
-            return row
-        return None
-
-    def get_topic(self, cursor, req, id):
-        columns = ('id', 'forum', 'time', 'subject', 'body', 'author')
-        sql = 'SELECT id, forum, time, subject, body, author FROM topic WHERE' \
-          ' id = %s' % (id)
-        self.log.debug(sql)
-        cursor.execute(sql)
-        for row in cursor:
-            row = dict(zip(columns, row))
-            row['author'] = wiki_to_oneliner(row['author'], self.env)
-            row['body'] = wiki_to_html(row['body'], self.env, req)
-            row['time'] = format_datetime(row['time'])
-            return row
-        return None
-
-    def get_forum(self, cursor, req, id):
-        columns = ('name', 'moderators', 'id', 'time', 'subject', 'description')
-        sql = 'SELECT name, moderators, id, time, subject, description FROM' \
-          ' forum WHERE id = %s' % (id)
-        self.log.debug(sql)
-        cursor.execute(sql)
-        for row in cursor:
-            row = dict(zip(columns, row))
-            row['moderators'] = row['moderators'].split(' ')
-            row['description'] = wiki_to_oneliner(row['description'], self.env)
-            return row
-        return None
-
-    def get_groups(self, cursor, req):
-        columns = ('id', 'name', 'description')
-        sql = 'SELECT id, name, description FROM forum_group'
-        self.log.debug(sql)
-        cursor.execute(sql)
-        groups = []
-        for row in cursor:
-            row = dict(zip(columns, row))
-            row['name'] = wiki_to_oneliner(row['name'], self.env)
-            row['description'] = wiki_to_oneliner(row['description'], self.env)
-            groups.append(row)
-        return groups
-
-    def get_forums(self, cursor, req):
-        columns = ('id', 'name', 'author', 'time', 'moderators', 'group',
-          'subject', 'description', 'topics', 'replies', 'lastreply',
-          'lasttopic')
-        sql = 'SELECT id, name, author, time, moderators, forum_group,' \
-          ' subject, description, (SELECT COUNT(id) FROM topic t WHERE' \
-          ' t.forum = forum.id), (SELECT COUNT(id) FROM message m WHERE' \
-          ' m.forum = forum.id), (SELECT MAX(time) FROM message m WHERE' \
-          ' m.forum = forum.id), (SELECT MAX(time) FROM topic t WHERE' \
-          ' t.forum = forum.id) FROM forum ORDER BY subject'
-        self.log.debug(sql)
-        cursor.execute(sql)
-        forums = []
-        for row in cursor:
-            row = dict(zip(columns, row))
-            row['moderators'] = wiki_to_oneliner(row['moderators'], self.env)
-            row['description'] = wiki_to_oneliner(row['description'], self.env)
-            if row['lastreply']:
-                row['lastreply'] = pretty_timedelta(row['lastreply'])
-            else:
-                row['lastreply'] = 'No replies'
-            if row['lasttopic']:
-                row['lasttopic'] = pretty_timedelta(row['lasttopic'])
-            else:
-                row['lasttopic'] = 'No topics'
-            row['time'] = format_datetime(row['time'])
-            forums.append(row)
-        return forums
-
-    def get_topics(self, cursor, req, forum):
-        columns = ('id', 'forum', 'time', 'subject', 'body', 'author',
-          'replies', 'lastreply')
-        sql = 'SELECT id, forum, time, subject, body, author, (SELECT' \
-          ' COUNT(id) FROM message m WHERE m.topic = topic.id), (SELECT' \
-          ' MAX(time) FROM message m WHERE m.topic = topic.id) FROM topic' \
-          ' WHERE forum = %s ORDER BY time' % (forum)
-        self.log.debug(sql)
-        cursor.execute(sql)
-        topics = []
-        for row in cursor:
-            row = dict(zip(columns, row))
-            row['author'] = wiki_to_oneliner(row['author'], self.env)
-            row['body'] = wiki_to_html(row['body'], self.env, req)
-            if row['lastreply']:
-                row['lastreply'] = pretty_timedelta(row['lastreply'])
-            else:
-                row['lastreply'] = 'No replies'
-            row['time'] = format_datetime(row['time'])
-            topics.append(row)
-        return topics
-
-    def get_messages(self, cursor, req, topic):
-        columns = ('id', 'replyto', 'time', 'author', 'body')
-        sql = 'SELECT id, replyto, time, author, body FROM message WHERE' \
-          ' topic = %s ORDER BY time' % (topic)
-        self.log.debug(sql)
-        cursor.execute(sql)
-
-        messagemap = {}
-        messages = []
-
-        for row in cursor:
-            row = dict(zip(columns, row))
-            row['author'] = wiki_to_oneliner(row['author'], self.env)
-            row['body'] = wiki_to_html(row['body'], self.env, req)
-            row['time'] = format_datetime(row['time'])
-            messagemap[row['id']] = row
-            # Add top-level messages to the main list, in order of time
-            if row['replyto'] == -1:
-                messages.append(row)
-
-        # Second pass, add replies
-        for message in messagemap.values():
-            if message['replyto'] != -1:
-                parent = messagemap[message['replyto']]
-                if 'replies' in parent:
-                    parent['replies'].append(message)
-                else:
-                    parent['replies'] = [message]
-        return messages;
-
-    def get_users(self):
-        users = []
-        for user in self.env.get_known_users():
-            users.append(user[0])
-        return users
-
-    def add_forum(self, cursor, name, author, subject, description, moderators,
-      group):
-        moderators = ' '.join(moderators)
-        if not group:
-            group = 'NULL'
-        sql = 'INSERT INTO forum (name, author, time, moderators, subject,' \
-          ' description, forum_group) VALUES ("%s", "%s", %s, "%s", "%s",' \
-          ' "%s", %s)' % (name, author, str(int(time.time())), moderators,
-          subject, description, group)
-        self.log.debug(sql)
-        cursor.execute(sql)
-
-    def add_topic(self, cursor, forum, subject, author, body):
-        sql = 'INSERT INTO topic (forum, time, author, subject, body) VALUES' \
-          ' (%s, %s, "%s", "%s", "%s")' % (forum, str(int(time.time())), author,
-          subject, body)
-        self.log.debug(sql)
-        cursor.execute(sql)
-
-    def add_message(self, cursor, forum, topic, replyto, author, body):
-        sql = 'INSERT INTO message (forum, topic, replyto, time, author, body)' \
-          ' VALUES (%s, %s, %s, %s, "%s", "%s")' % (forum, topic, replyto,
-          str(int(time.time())), author, body)
-        self.log.debug(sql)
-        cursor.execute(sql)
-
-    def delete_forum(self, cursor, forum):
-        sql = 'DELETE FROM message WHERE forum = %s' % (forum)
-        self.log.debug(sql)
-        cursor.execute(sql)
-        sql = 'DELETE FROM topic WHERE forum = %s' % (forum)
-        self.log.debug(sql)
-        cursor.execute(sql)
-        sql = 'DELETE FROM forum WHERE id = %s' % (forum)
-        self.log.debug(sql)
-        cursor.execute(sql)
-
-    def delete_topic(self, cursor, forum, topic):
-        sql = 'DELETE FROM message WHERE forum = %s AND topic = %s' % (forum,
-          topic)
-        self.log.debug(sql)
-        cursor.execute(sql)
-        sql = 'DELETE FROM topic WHERE id = %s' % (topic)
-        self.log.debug(sql)
-        cursor.execute(sql)
-
-    def delete_message(self, cursor, forum, topic, message):
-        # Get message replies
-        sql = 'SELECT id FROM message WHERE replyto = %s' % (message)
-        self.log.debug(sql)
-        cursor.execute(sql)
-        replies = []
-        for row in cursor:
-            replies.append(row[0])
-
-        # Delete all replies
-        for reply in replies:
-            self.delete_message(cursor, forum, topic, reply)
-
-        # Delete message itself
-        sql = 'DELETE FROM message WHERE id = %s' % (message)
-        self.log.debug(sql)
-        cursor.execute(sql)

discussionplugin/0.9/tracdiscussion/templates/forum-add.cs

@@ -2 +2 @@
-
-<h1>Add Forum</h1>
-trac.href.discussion
+discussion.href
-  <fieldset>
-    <legend>
@@ -47 +47 @@
-      <input type="submit" name="submit" value="Submit"/>
-      <input type="submit" name="cancel" value="Cancel"/>
-
+discussion_
-    </div>
-  </fieldset>

discussionplugin/0.9/tracdiscussion/templates/forum-admin.cs

@@ -4 +4 @@
-    var forum_list_form = document.getElementById('forum-list-form');
-    var group_select = document.getElementById('group-select-' + forum);
-
+discussion_
-    forum_list_form.group.value = group_select.value;
-    forum_list_form.forum.value = forum;
@@ -44 +44 @@
-    <div class="buttons">
-      <input type="submit" name="submit" value="Add"/>
-
+discussion_
-    </div>
-  </fieldset>
@@ -104 +104 @@
-    <div class="buttons">
-      <input type="submit" name="remove" value="Remove selected items" />
-
+discussion_
-      <input type="hidden" name="group" value=""/>
-      <input type="hidden" name="forum" value=""/>

discussionplugin/0.9/tracdiscussion/templates/forum-list.cs

@@ -27 +27 @@
-         <tr class="<?cs if:name(forum) % #2 ?>even<?cs else ?>odd<?cs /if ?>">
-            <td class="title">
-trac.href.discussion
+discussion.href
-                <div class="subject"><?cs var:forum.subject ?></div>
-                <div class="description"><?cs var:forum.description ?></div>
@@ -33 +33 @@
-            </td>
-            <td class="moderators">
-trac.href.discussion
+discussion.href
-                <div class="moderators"><?cs var:forum.moderators ?></div>
-              </a>
-            </td>
-            <td class="lasttopic">
-trac.href.discussion
+discussion.href
-                <div class="lasttopic"><?cs var:forum.lasttopic ?></div>
-              </a>
-            </td>
-            <td class="lastreply">
-trac.href.discussion
+discussion.href
-                <div class="lastreply"><?cs var:forum.lastreply ?></div>
-              </a>
-            </td>
-            <td class="founded">
-trac.href.discussion
+discussion.href
-               <div class="founded"><?cs var:forum.time ?></div>
-              </a>
-            </td>
-            <td class="topics">
-trac.href.discussion
+discussion.href
-                <div class="topics"><?cs var:forum.topics ?></div>
-              </a>
-            </td>
-            <td class="replies">
-trac.href.discussion
+discussion.href
-                <div class="replies"><?cs var:forum.replies ?></div>
-              </a>
@@ -78 +78 @@
-<?cs if:trac.acl.DISCUSSION_MODIFY ?>
-  <div class="buttons">
-trac.href.discussion
+discussion.href
-      <input type="submit" name="newforum" value="New Forum"/>
-
+discussion_
-    </form>
-  </div>

discussionplugin/0.9/tracdiscussion/templates/group-admin.cs

@@ -16 +16 @@
-    <div class="buttons">
-      <input type="submit" name="submit" value="Add"/>
-
+discussion_
-    </div>
-  </fieldset>
@@ -49 +49 @@
-    <div class="buttons">
-      <input type="submit" name="remove" value="Remove selected items" />
-
+discussion_
-    </div>
-  </form>

discussionplugin/0.9/tracdiscussion/templates/message-list.cs

@@ -1 @@
-<?cs include "discussion-header.cs" ?>
-
-<?cs def:display_preview() ?>
-  <li class="preview">
@@ -7 +5 @@
-      <?cs var:discussion.body ?>
-    </div>
-
-
+
+
+
+
+
+
+
-    </div>
-  </li>
@@ -20 +23 @@
-         Reply:
-      </legend>
-post" action="<?cs var:trac.href.discussion ?>/<?cs var:discussion.forum.id ?>/<?cs var:discussion.topic.id
+get" action="<?cs var:discussion.href
-        <div class="field">
-          <label for="author">Author:</label><br/>
@@ -36 +39 @@
-          <input type="submit" name="preview" value="Preview"/>
-          <input type="submit" name="submit" value="Reply"/>
-trac.href.discussion ?>/<?cs var:discussion.forum.id ?>/<?cs var:discussion.topic.id
+discussion.href
-        </div>
-        <input type="hidden" name="reply" value="<?cs var:args.reply ?>"/>
-
+discussion_
-      </form>
-    </fieldset>
@@ -53 +56 @@
-      </div>
-      <div class="controls">
-trac.href.discussion ?>/<?cs var:discussion.forum.id ?>/<?cs var:discussion.topic.id ?>?
+discussion.href ?>?discussion_
-        <?cs if:trac.acl.DISCUSSION_MODERATE && discussion.is_moderator ?>
-trac.href.discussion ?>/<?cs var:discussion.forum.id ?>/<?cs var:discussion.topic.id ?>?
+discussion.href ?>?discussion_
-        <?cs /if ?>
-      </div>
@@ -67 +70 @@
-      </div>
-    </li>
-body || (args.action == "add") || (args.
+id || (args.discussion_action == "add") || (args.discussion_
-      <ul>
-        <?cs call:display_topic(message.replies) ?>
@@ -81 +84 @@
-<?cs /def ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      </div>
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-      </div>
-    </div>
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  <?cs /if ?>
-</div>
@@ -120 +135 @@
-<?cs if:trac.acl.DISCUSSION_MODERATE && discussion.is_moderator ?>
-  <div class="buttons">
-post" action="<?cs var:trac.href.discussion ?>/<?cs var:discussion.forum.id ?>/<?cs var:discussion.topic.id
+get" action="<?cs var:discussion.href
-      <input type="submit" name="deletetopic" value="Delete Topic" onClick="return confirm('Do you realy want to delete this topic?')"/>
-
+discussion_
-      <input type="hidden" name="reply" value="-1">
-    </form>
@@ -128 +143 @@
-<?cs /if ?>
-
-
+
+
+
+
+
+
+

discussionplugin/0.9/tracdiscussion/templates/topic-add.cs

@@ -13 +13 @@
-          <?cs var:discussion.body ?>
-        </div>
-
-
+
+
+
+
+
+
+
-        </div>
-      </div>
@@ -21 +26 @@
-<?cs /if ?>
-
-trac.href.discussion ?>/<?cs var:discussion.forum.id
+discussion.href
-  <fieldset>
-    <legend>
@@ -46 +51 @@
-      <input type="submit" name="submit" value="Submit"/>
-      <input type="submit" name="cancel" value="Cancel"/>
-
+discussion_
-    </div>
-  </fieldset>

discussionplugin/0.9/tracdiscussion/templates/topic-list.cs

@@ -17 +17 @@
-        <tr class="<?cs if:name(topic) % #2 ?>even<?cs else ?>odd<?cs /if ?>">
-          <td class="subject">
-trac.href.discussion ?>/<?cs var:discussion.forum.id
+discussion.href
-              <div class="subject"><?cs var:topic.subject ?></div>
-            </a>
-          </td>
-          <td class="author">
-trac.href.discussion ?>/<?cs var:discussion.forum.id
+discussion.href
-              <div class="author" ><?cs var:topic.author ?></div>
-            </a>
-          </td>
-          <td class="lastreply">
-trac.href.discussion ?>/<?cs var:discussion.forum.id
+discussion.href
-              <div class="lastreply"><?cs var:topic.lastreply ?></div>
-            </a>
-          </td>
-          <td class="founded">
-trac.href.discussion ?>/<?cs var:discussion.forum.id
+discussion.href
-              <div class="founded" ><?cs var:topic.time ?></div>
-            </a>
-          </td>
-          <td class="replies">
-trac.href.discussion ?>/<?cs var:discussion.forum.id
+discussion.href
-              <div class="replies" ><?cs var:topic.replies ?></div>
-            </a>
@@ -47 +47 @@
-
-  <div class="buttons">
-trac.href.discussion ?>/<?cs var:discussion.forum.id
+discussion.href
-      <input type="submit" name="newtopic" value="New Topic"/>
-
+discussion_
-    </form>
-    <?cs if:trac.acl.DISCUSSION_MODIFY ?>
-trac.href.discussion ?>/<?cs var:discussion.forum.id
+discussion.href
-        <input type="submit" name="deleteforum" value="Delete Forum" onClick="return confirm('Do you realy want to delete this forum?')"/>
-
+discussion_
-      </form>
-    <?cs /if ?>

discussionplugin/0.9/tracdiscussion/wiki.py

@@ +1 @@
+from tracdiscussion.api import *
-from trac.core import *
-
+
+
+
+
+
+
+
+
-