Changeset 1006

Timestamp:

07/06/06 15:11:08 (3 years ago)

Author:

Blackhex

Message:

DiscussionPlugin:

• Search implementation based on #491 (Thanks to jon@licq.org).
  
• Possibly bug #478 fix.
  
• Bug #486 fix.
  
• Bug #485 fix.
  
• Display of empty groups bug fix.
  
• Some code reorganization.
  

Files:

• discussionplugin/0.9/setup.py (modified) (1 diff)
• discussionplugin/0.9/tracdiscussion/admin.py (modified) (7 diffs)
• discussionplugin/0.9/tracdiscussion/api.py (modified) (13 diffs)
• discussionplugin/0.9/tracdiscussion/core.py (modified) (3 diffs)
• discussionplugin/0.9/tracdiscussion/db/db1.py (modified) (2 diffs)
• discussionplugin/0.9/tracdiscussion/db/db2.py (modified) (2 diffs)
• discussionplugin/0.9/tracdiscussion/init.py (modified) (1 diff)
• discussionplugin/0.9/tracdiscussion/search.py (added)
• discussionplugin/0.9/tracdiscussion/templates/forum-add.cs (modified) (1 diff)
• discussionplugin/0.9/tracdiscussion/templates/forum-admin.cs (modified) (3 diffs)
• discussionplugin/0.9/tracdiscussion/templates/forum-list.cs (modified) (1 diff)
• discussionplugin/0.9/tracdiscussion/templates/group-admin.cs (modified) (2 diffs)
• discussionplugin/0.9/tracdiscussion/timeline.py (modified) (3 diffs)
• discussionplugin/0.9/tracdiscussion/wiki.py (modified) (3 diffs)

discussionplugin/0.9/setup.py

@@ -13 +13 @@
-    'TracDiscussion.wiki = tracdiscussion.wiki',
-    'TracDiscussion.timeline = tracdiscussion.timeline',
-
+
+
-  keywords = 'trac discussion',
-  author = 'Alec Thomas, Radek Bartoň',

discussionplugin/0.9/tracdiscussion/admin.py

@@ +1 @@
+from tracdiscussion.api import *
-from trac.core import *
-from trac.perm import IPermissionRequestor
@@ -55 +56 @@
-        if mode == 'group-admin':
-            # Display group list
-
+
+
-        elif mode == 'group-post-add':
-            # Get form values
@@ -62 +64 @@
-
-            # Add new group
-self._add_group(cursor
+add_group(cursor, self.log
-
-            # Display group list
-
+
+
-            mode = 'group-admin'
-        elif mode == 'group-delete':
@@ -74 +77 @@
-
-            # Delete selected groups
-
+
+
+
-
-            # Display group list
-
+
+
-            mode = 'group-admin'
-        elif mode == 'forum-admin':
-            # Display forum list
-
-
+
+
+
+
-        elif mode == 'forum-post-add':
-            # Get form values
@@ -90 +98 @@
-            description = req.args.get('description')
-            moderators = req.args.get('moderators')
-
-
-
-
+
+
+
+
+
+
-
-            # Add new forum
-
+
+
-
-            # Display forum list
-
-
+
+
+
+
-            mode = 'forum-admin'
-        elif mode == 'forum-delete':
@@ -109 +122 @@
-
-            # Delete selected forums
-
+
+
+
-
-            # Display forum list
-
-
+
+
+
+
-            mode = 'forum-admin'
-        elif mode == 'forum-change-group':
@@ -121 +138 @@
-
-            # Set new group
-lf._set_group(cursor
+t_group(cursor, self.env, self.log
-
-            # Display forum list
-
-
+
+
+
+
-            mode = 'forum-admin'
-
-        # Fill template values and return mode template
-        req.hdf['discussion.href'] = self.env.href.admin(category, page)
-self._get_users(
+get_users(self.env, self.log
-        db.commit()
-        return mode + '.cs', None
-
-    def _get_groups(self, cursor):
-        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):
-        columns = ('id', 'name', 'author', 'moderators', 'group', 'subject',
-          'description')
-        sql = "SELECT id, name, author, moderators, forum_group, subject," \
-          " description FROM forum"
-        self.log.debug(sql)
-        cursor.execute(sql)
-        forums = []
-        for row in cursor:
-            row = dict(zip(columns, row))
-            row['name'] = wiki_to_oneliner(row['name'], self.env)
-            row['subject'] = wiki_to_oneliner(row['subject'], self.env)
-            row['description'] = wiki_to_oneliner(row['description'], self.env)
-            row['moderators'] = wiki_to_oneliner(row['moderators'], self.env)
-            forums.append(row)
-        return forums
-
-    def _get_users(self):
-        users = []
-        for user in self.env.get_known_users():
-            users.append(user[0])
-        return users
-
-    def _add_group(self, cursor, name, description):
-        sql = "INSERT INTO forum_group (name, description) VALUES ('%s', '%s')" \
-          % (name, description)
-        self.log.debug(sql)
-        cursor.execute(sql)
-
-    def _add_forum(self, cursor, name, author, subject, description, moderators):
-        moderators = ' '.join(moderators)
-        sql = "INSERT INTO forum (name, author, time, moderators, subject," \
-          " description) VALUES ('%s', '%s', %s, '%s', '%s', '%s')" % (name,
-          author, str(int(time.time())), moderators, subject, description)
-        self.log.debug(sql)
-        cursor.execute(sql)
-
-    def _delete_groups(self, cursor, groups):
-        if groups:
-            groups = ', '.join(groups)
-            sql = "DELETE FROM forum_group WHERE id IN (%s)" % (groups)
-            self.log.debug(sql)
-            cursor.execute(sql)
-            sql = "UPDATE forum SET forum_group = NULL WHERE forum_group IN" \
-              " (%s)" % (groups)
-            cursor.execute(sql)
-
-    def _delete_forums(self, cursor, forums):
-        if forums:
-            forums = ', '.join(forums)
-            sql = "DELETE FROM message WHERE forum IN (%s)" % (forums)
-            self.log.debug(sql)
-            cursor.execute(sql)
-            sql = "DELETE FROM topic WHERE forum IN (%s)" % (forums)
-            self.log.debug(sql)
-            cursor.execute(sql)
-            sql = "DELETE FROM forum WHERE id IN (%s)" % (forums)
-            self.log.debug(sql)
-            cursor.execute(sql)
-
-    def _set_group(self, cursor, forum, group):
-        if not group:
-            group = 'NULL'
-        sql = "UPDATE forum SET forum_group = %s WHERE id = %s" % (group, forum)
-        self.log.debug(sql)
-        cursor.execute(sql)

discussionplugin/0.9/tracdiscussion/api.py

@@ -1 +1 @@
-from trac.core import *
-from trac.wiki import wiki_to_html, wiki_to_oneliner
-
+, escape, unescape
-import time
-
@@ -9 +9 @@
-    columns = ('id', 'forum', 'topic', 'replyto', 'time', 'author', 'body')
-    sql = "SELECT id, forum, topic, replyto, time, author, body FROM message" \
- % (id)
-
-
+
+
+, (id,)
-    for row in cursor:
-        row = dict(zip(columns, row))
@@ -22 +22 @@
-    columns = ('id', 'forum', 'time', 'subject', 'body', 'author')
-    sql = "SELECT id, forum, time, subject, body, author FROM topic WHERE id =" \
- % (id)
-
-
+
+
+, (id,)
-    for row in cursor:
-        row = dict(zip(columns, row))
@@ -36 +36 @@
-    columns = ('id', 'forum', 'time', 'subject', 'body', 'author')
-    sql = "SELECT id, forum, time, subject, body, author FROM topic WHERE subject =" \
-'%s'" % (subject)
-
-
+%s"
+
+, (subject,)
-    for row in cursor:
-        row = dict(zip(columns, row))
@@ -50 +50 @@
-    columns = ('name', 'moderators', 'id', 'time', 'subject', 'description')
-    sql = "SELECT name, moderators, id, time, subject, description FROM" \
- % (id)
-
-
+
+
+, (id,)
-    for row in cursor:
-        row = dict(zip(columns, row))
@@ -60 +60 @@
-    return None
-
+# Set item functions
+
+def set_group(cursor, env, log, forum, group):
+    if not group:
+        group = '0'
+    sql = "UPDATE forum SET forum_group = %s WHERE id = %s"
+    log.debug(sql)
+    cursor.execute(sql, (group, forum))
+
-# Get list of items functions
+
-def get_groups(cursor, env, req, log):
-columns = ('id', 'name', 'description')
-id, name, description FROM forum_group
+# Get count of forums without group
+COUNT(id) FROM forum WHERE forum_group = 0
-    log.debug(sql)
-    cursor.execute(sql)
-
+
+
+
+
+
+
+
+
+
+
+
+
-    for row in cursor:
-        row = dict(zip(columns, row))
@@ -72 +93 @@
-        row['description'] = wiki_to_oneliner(row['description'], env)
-        groups.append(row)
+    log.debug(groups)
-    return groups
-
@@ -87 +109 @@
-    for row in cursor:
-        row = dict(zip(columns, row))
+        #row['name'] = wiki_to_oneliner(row['name'], env)
+        #row['subject'] = wiki_to_oneliner(row['subject'], env)
-        row['moderators'] = wiki_to_oneliner(row['moderators'], env)
-        row['description'] = wiki_to_oneliner(row['description'], env)
@@ -107 +131 @@
-      " 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" \
- % (forum)
-
-
+
+
+, (forum,)
-    topics = []
-    for row in cursor:
@@ -126 +150 @@
-    columns = ('id', 'replyto', 'time', 'author', 'body')
-    sql = "SELECT id, replyto, time, author, body FROM message WHERE topic =" \
- % (topic)
-
-
+
+
+, (topic,)
-
-    messagemap = {}
@@ -154 +178 @@
-    return messages;
-
-
+, log
-    users = []
-    for user in env.get_known_users():
+        log.debug(user)
-        users.append(user[0])
-    return users
-
-# Add items functions
+
+def add_group(cursor, log, name, description):
+    sql = "INSERT INTO forum_group (name, description) VALUES (%s, %s)"
+    log.debug(sql)
+    cursor.execute(sql, (name, description))
+
-
-def add_forum(cursor, log, name, author, subject, description, moderators,
@@ -166 +197 @@
-    moderators = ' '.join(moderators)
-    if not group:
-NULL
+0
-    sql = "INSERT INTO forum (name, author, time, moderators, subject," \
-
-
-
-
-
+
+
+
+
-
-def add_topic(cursor, log, forum, subject, author, body):
-    sql = "INSERT INTO topic (forum, time, author, subject, body) VALUES" \
-
-
-
-
+
+
+
-
-def add_message(cursor, log, forum, topic, replyto, author, body):
-    sql = "INSERT INTO message (forum, topic, replyto, time, author, body)" \
-'%s', '%s')" % (forum, topic, replyto,
-  str(int(time.time())), author, body
-log.debug(sql)
-cursor.execute(sql
+%s, %s)"
+log.debug(sql
+cursor.execute(sql, (forum, topic, replyto, str(int(time.time())),
+  escape(author), escape(body))
-
-# Delete items functions
-
+def delete_group(cursor, log, group):
+    sql = "DELETE FROM forum_group WHERE id = %s"
+    log.debug(sql)
+    cursor.execute(sql, (group,))
+    sql = "UPDATE forum SET forum_group = 0 WHERE forum_group = %s"
+    log.debug(sql)
+    cursor.execute(sql, (group,))
+
-def delete_forum(cursor, log, forum):
- % (forum)
-
-
- % (forum)
-
-
- % (forum)
-
-
+
+
+, (forum,)
+
+
+, (forum,)
+
+
+, (forum,)
-
-def delete_topic(cursor, log, topic):
- % (topic)
-
-
- % (topic)
-
-
+
+
+, (topic,)
+
+
+, (topic,)
-
-def delete_message(cursor, log, message):
-    # Get message replies
- % (message)
-
-
+
+
+, (message,)
-    replies = []
-    for row in cursor:
@@ -223 +260 @@
-
-    # Delete message itself
- % (message)
-
-
+
+
+, (message,)

discussionplugin/0.9/tracdiscussion/core.py

@@ -153 +153 @@
-            req.hdf['discussion.forums'] = get_forums(cursor, self.env, req,
-              self.log)
+            self.log.debug(req.hdf.get('discussion.forums'))
-        elif mode == 'forum-add':
-            req.perm.assert_permission('DISCUSSION_MODIFY')
@@ -158 +159 @@
-            req.hdf['discussion.groups'] = get_groups(cursor, self.env, req,
-              self.log)
-
+, self.log
-        elif mode == 'forum-post-add':
-            req.perm.assert_permission('DISCUSSION_MODIFY')
@@ -169 +170 @@
-            moderators = req.args.get('moderators')
-            group = req.args.get('group')
-
-moderators.split(' ')
-else
-''
+not 
+[]
+if not isinstance(moderators, list)
+[moderators]
-
-            # Add new forum

discussionplugin/0.9/tracdiscussion/db/db1.py

@@ +1 @@
+# Commont SQL statements
-sql = ["""CREATE TABLE forum (
-  id integer PRIMARY KEY,
@@ -26 +27 @@
-"""INSERT INTO system (name, value) VALUES ('discussion_version', 1);""" ]
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

discussionplugin/0.9/tracdiscussion/db/db2.py

@@ +1 @@
+# Common statements
-sql = ["""CREATE TABLE forum_group (
-  id integer PRIMARY KEY,
@@ -8 +9 @@
-"""UPDATE system SET value = 2 WHERE name='discussion_version';"""]
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

discussionplugin/0.9/tracdiscussion/init.py

@@ -32 +32 @@
-            module = __import__('tracdiscussion.db.%s' % (script_name),
-            globals(), locals(), ['do_upgrade'])
-
+self.env, 
-            #except:
-            #    raise TracError('Error upgrading database to version %i' % I)

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

@@ -31 +31 @@
-      <?cs /if ?>
-    </div>
-0
+1
-      <div class="group">
-        <label for="group">Forum Group:</label><br/>
-        <select name="group">
-          <option value="">None</option>
-          <?cs each:group = discussion.groups ?>
-            <option value="<?cs var:group.id ?>"><?cs var:group.name ?></option>

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

@@ -42 +42 @@
-      <?cs /if ?>
-    </div>
+    <?cs if:discussion.groups.1.id ?>
+      <div class="group">
+        <label for="group">Forum Group:</label><br/>
+        <select name="group">
+          <?cs each:group = discussion.groups ?>
+            <option value="<?cs var:group.id ?>"><?cs var:group.name ?></option>
+          <?cs /each ?>
+        </select><br/>
+      </div>
+    <?cs else ?>
+      <input type="hidden" name="group" value=""/>
+    <?cs /if ?>
-    <div class="buttons">
-      <input type="submit" name="submit" value="Add"/>
@@ -59 +71 @@
-          <th class="description">Description</th>
-          <th class="moderators">Moderators</th>
-0
+1
-            <th class="group">Group</th>
-          <?cs /if ?>
@@ -82 +94 @@
-              <div class="moderators"><?cs var:forum.moderators ?></div>
-            </td>
-0
+1
-              <td class="group">
-                <div class="group">
-                  <select id="group-select-<?cs var:forum.id ?>" name="group-<?cs var:forum.id ?>" onChange="submit_group_change(<?cs var:forum.id ?>)">
-                    <option value="">None</option>
-                    <?cs each:group = discussion.groups ?>
-                      <?cs if:group.id == forum.group ?>

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

@@ -71 +71 @@
-<h1>Forum List</h1>
-
-<?cs call:display_group(nogroup, discussion.forums) ?>
-<?cs each:group = discussion.groups ?>
-
+
+
+
-<?cs /each ?>
-

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

@@ -21 +21 @@
-</form>
-
-0.name
+1.id
-  <form class="forum-list" method="post">
-    <table class="listing">
@@ -33 +33 @@
-      </tbody>
-        <?cs each:group = discussion.groups ?>
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        <?cs /each ?>
-      </tbody>

discussionplugin/0.9/tracdiscussion/timeline.py

@@ -79 +79 @@
-        columns = ('id', 'name', 'author', 'subject', 'description', 'time')
-        sql = "SELECT id, name, author, subject, description, time FROM forum" \
- % (start, stop)
+
-        self.log.debug(sql)
-
+, (start, stop)
-        for row in cursor:
-            row = dict(zip(columns, row))
@@ -89 +89 @@
-        columns = ('id', 'subject', 'author', 'time', 'forum', 'forum_name')
-        sql = "SELECT id, subject, author, time, forum, (SELECT name FROM forum" \
-
-
+
-        self.log.debug(sql)
-
+, (start, stop)
-        for row in cursor:
-            row = dict(zip(columns, row))
@@ -102 +101 @@
-        sql = "SELECT id, author, time, forum, topic, (SELECT name FROM forum f" \
-          " WHERE f.id = message.forum), (SELECT subject FROM topic t WHERE" \
-
-
+
-        self.log.debug(sql)
-
+, (start, stop)
-        for row in cursor:
-            row = dict(zip(columns, row))

discussionplugin/0.9/tracdiscussion/wiki.py

@@ -146 +146 @@
-        if ns == 'forum':
-            columns = ('subject',)
- % (id)
+
-            self.log.debug(sql)
-
+, (id,)
-            for row in cursor:
-                row = dict(zip(columns, row))
@@ -158 +158 @@
-            columns = ('forum', 'forum_subject', 'subject')
-            sql = "SELECT forum, (SELECT subject FROM forum WHERE id =" \
- % (id)
+
-            self.log.debug(sql)
-
+, (id,)
-            for row in cursor:
-                row = dict(zip(columns, row))
@@ -173 +173 @@
-            sql = "SELECT forum, topic, (SELECT subject FROM forum WHERE id =" \
-              " message.forum), (SELECT subject FROM topic WHERE id =" \
- % (id)
+
-            self.log.debug(sql)
-
+, (id,)
-            for row in cursor:
-                row = dict(zip(columns, row))