Changeset 1088

Timestamp:

08/06/06 11:36:35 (2 years ago)

Author:

Blackhex

Message:

DiscussionPlugin:

• Groups, forums and topics ordering by their fields in lists.
  
• Display of new topics and messages since last visit.
  
• Ability to change between tree and flat message list display.
  

Files:

• discussionplugin/0.9/tracdiscussion/api.py (modified) (19 diffs)
• discussionplugin/0.9/tracdiscussion/htdocs/css/admin.css (modified) (1 diff)
• discussionplugin/0.9/tracdiscussion/htdocs/css/discussion.css (modified) (6 diffs)
• discussionplugin/0.9/tracdiscussion/templates/admin-forum-list.cs (modified) (1 diff)
• discussionplugin/0.9/tracdiscussion/templates/admin-group-list.cs (modified) (1 diff)
• discussionplugin/0.9/tracdiscussion/templates/discussion-header.cs (modified) (1 diff)
• discussionplugin/0.9/tracdiscussion/templates/forum-list.cs (modified) (2 diffs)
• discussionplugin/0.9/tracdiscussion/templates/message-list.cs (modified) (5 diffs)
• discussionplugin/0.9/tracdiscussion/templates/topic-list.cs (modified) (2 diffs)

discussionplugin/0.9/tracdiscussion/api.py

@@ -136 +136 @@
-                elif action == 'delete':
-                    return ['message-delete', 'message-list']
+                elif action == 'set-display':
+                    return ['message-set-display', 'message-list']
-                else:
-                    return ['message-list']
@@ -157 +159 @@
-                elif action == 'delete':
-                    return ['message-delete', 'message-list']
+                elif action == 'set-display':
+                    return ['message-set-display', 'message-list']
-                else:
-                    return ['message-list']
@@ -182 +186 @@
-                    self.req.hdf['discussion.no_display'] = True
-                    return ['topic-delete', 'message-list']
+                elif action == 'set-display':
+                    return ['message-set-display', 'message-list']
-                else:
-                    return ['message-list']
@@ -207 +213 @@
-                elif action == 'post-move':
-                    return ['topic-post-move', 'topic-list']
+                elif action == 'set-display':
+                    return ['message-set-display', 'message-list']
-                else:
-                    return ['message-list']
@@ -279 +287 @@
-                self.req.perm.assert_permission('DISCUSSION_ADMIN')
-
+                # Get form values
+                order = self.req.args.get('order') or 'id'
+                desc = self.req.args.get('desc')
+
+                # Prepare ORDER BY statement
+                order_by = 'ORDER BY ' + order
+                if desc:
+                    order_by = order_by + ' DESC'
+                else:
+                    order_by = order_by + ' ASC'
+
-                # Display groups.
+                self.req.hdf['discussion.order'] = order
+                self.req.hdf['discussion.desc'] = desc
-                if group:
-                    self.req.hdf['discussion.name'] = group['name']
-                    self.req.hdf['discussion.description'] = group['description']
-
+order_by
-
-            elif mode == 'group-add':
@@ -322 +343 @@
-                # Delete selected groups.
-                if selection:
-
-
+_id
+_id
-
-            elif mode == 'forum-list':
-                self.req.perm.assert_permission('DISCUSSION_VIEW')
-
+                # Get form values
+                order = self.req.args.get('order') or 'id'
+                desc = self.req.args.get('desc')
+
+                # Prepare ORDER BY statement
+                order_by = 'ORDER BY ' + order
+                if desc:
+                    order_by = order_by + ' DESC'
+                else:
+                    order_by = order_by + ' ASC'
+
-                # Display forums.
+                self.req.hdf['discussion.order'] = order
+                self.req.hdf['discussion.desc'] = desc
-                self.req.hdf['discussion.groups'] = self.get_groups()
-
+order_by
-
-            elif mode == 'admin-forum-list':
-                self.req.perm.assert_permission('DISCUSSION_ADMIN')
-
+                # Get form values
+                order = self.req.args.get('order') or 'id'
+                desc = self.req.args.get('desc')
+
+                # Prepare ORDER BY statement
+                order_by = 'ORDER BY ' + order
+                if desc:
+                    order_by = order_by + ' DESC'
+                else:
+                    order_by = order_by + ' ASC'
+
-                # Display forums.
+                self.req.hdf['discussion.order'] = order
+                self.req.hdf['discussion.desc'] = desc
+                self.log.debug(forum)
-                if forum:
-                    self.req.hdf['discussion.name'] = forum['name']
@@ -344 +392 @@
-                self.req.hdf['discussion.users'] = self.get_users()
-                self.req.hdf['discussion.groups'] = self.get_groups()
-
+order_by
-
-            elif mode == 'forum-add':
@@ -407 +455 @@
-                # Delete selected forums.
-                if selection:
-
-
+_id
+_id
-
-            elif mode == 'topic-list':
-                self.req.perm.assert_permission('DISCUSSION_VIEW')
-
+                # Get form values
+                order = self.req.args.get('order') or 'id'
+                desc = self.req.args.get('desc')
+
+                # Prepare ORDER BY statement
+                order_by = 'ORDER BY ' + order
+                if desc:
+                    order_by = order_by + ' DESC'
+                else:
+                    order_by = order_by + ' ASC'
+
-                # Display topics.
-
+
+
+
+
-
-            elif mode == 'topic-add':
@@ -513 +575 @@
-                new_body = Markup(self.req.args.get('body'))
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                if new_author:
-                    self.req.hdf['discussion.author'] = wiki_to_oneliner(
@@ -523 +601 @@
-                    self.req.hdf['discussion.body'] = wiki_to_html(new_body,
-                      self.env, self.req)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-            elif mode == 'message-quote':
@@ -546 +636 @@
-                      new_author, new_body)
-                else:
-
+
+
-
-            elif mode == 'message-edit':
@@ -576 +667 @@
-                # Delete message.
-                self.delete_message(message['id'])
+
+            elif mode == 'message-set-display':
+                self.req.perm.assert_permission('DISCUSSION_VIEW')
+
+                # Get form values
+                display = self.req.args.get('display')
+
+                # Set message list display mode to session
+                self.req.session['message-list-display'] = display
-
-    # Get one item functions
@@ -686 +786 @@
-    # Get list functions
-
-
+, order_by = 'ORDER BY id ASC'
-        # Get count of forums without group
-        sql = "SELECT COUNT(id) FROM forum WHERE forum_group = 0"
@@ -700 +800 @@
-        columns = ('id', 'name', 'description', 'forums')
-        sql = "SELECT id, name, description, (SELECT COUNT(id) FROM forum f" \
-"
+ " + order_by
-        self.log.debug(sql)
-        self.cursor.execute(sql)
@@ -710 +810 @@
-        return groups
-
-
+, order_by = 'ORDER BY subject ASC'
-        columns = ('id', 'name', 'author', 'time', 'moderators', 'group',
-          'subject', 'description', 'topics', 'replies', 'lastreply',
@@ -716 +816 @@
-        sql = "SELECT id, name, author, time, moderators, forum_group," \
-          " subject, description, (SELECT COUNT(id) FROM topic t WHERE" \
-
-
-
-
+
+
+
+
+
-        self.log.debug(sql)
-        self.cursor.execute(sql)
@@ -739 +840 @@
-        return forums
-
-
+, order_by = 'ORDER BY time ASC'
-        columns = ('id', 'forum', 'time', 'subject', 'body', 'author',
-          'replies', 'lastreply')
-        sql = "SELECT id, forum, time, subject, body, author, (SELECT" \
-, (SELECT
-MAX(time) FROM message m WHERE m.topic = topic.id) FROM topic
-WHERE forum = %s ORDER BY time"
+ AS replies,
+(SELECT MAX(time) FROM message m WHERE m.topic = topic.id) AS
+lastreply FROM topic WHERE forum = %s " + order_by
-        self.log.debug(sql % (forum,))
-        self.cursor.execute(sql, (forum,))
@@ -761 +862 @@
-        return topics
-
-
+, time, order_by = 'ORDER BY time ASC'
-        columns = ('id', 'replyto', 'time', 'author', 'body')
-        sql = "SELECT id, replyto, time, author, body FROM message WHERE" \
-ORDER BY time"
+" + order_by
-        self.log.debug(sql % (topic,))
-        self.cursor.execute(sql, (topic,))
-
-        messagemap = {}
-        messages = []
-
-        for row in self.cursor:
-            row = dict(zip(columns, row))
-            row['author'] = wiki_to_oneliner(row['author'], self.env)
-            row['body'] = wiki_to_html(row['body'], self.env, self.req)
+            if int(row['time']) > time:
+                row['new'] = True
-            row['time'] = format_datetime(row['time'])
-            messagemap[row['id']] = row
@@ -791 +892 @@
-                    parent['replies'] = [message]
-        return messages;
+
+    def get_flat_messages(self, topic, time, order_by = 'ORDER BY time ASC'):
+        columns = ('id', 'replyto', 'time', 'author', 'body')
+        sql = "SELECT id, replyto, time, author, body FROM message WHERE" \
+          " topic = %s " + order_by
+        self.log.debug(sql % (topic,))
+        self.cursor.execute(sql, (topic,))
+        messages = []
+        for row in self.cursor:
+            row = dict(zip(columns, row))
+            row['author'] = wiki_to_oneliner(row['author'], self.env)
+            row['body'] = wiki_to_html(row['body'], self.env, self.req)
+            if int(row['time']) > time:
+                row['new'] = True
+            row['time'] = format_datetime(row['time'])
+            messages.append(row)
+        return messages
-
-    def get_users(self):

discussionplugin/0.9/tracdiscussion/htdocs/css/admin.css

@@ -21 +21 @@
-}
-
-
+forum_
-{
-  text-align: center;

discussionplugin/0.9/tracdiscussion/htdocs/css/discussion.css

@@ -23 +23 @@
-
-.forum-list td.id, .forum-list td.moderators, .forum-list td.lasttopic,
-founded
+time
-.forum-list td.replies
-{
@@ -53 +53 @@
-/* Topic list */
-.topic-list td.id, .topic-list td.author, .topic-list td.lastreply,
-founded
+time
-{
-  text-align: center;
@@ -63 +63 @@
-}
-
+.topic-add form.add_form
+{
+  margin: 1em;
+}
+
-/* Message list */
-.message-list div.topic
@@ -69 +74 @@
-  margin-bottom: 0em;
-  border: 1px solid #d7d7d7;
+}
+
+.message-list div.topic.new
+{
+  border: 2px solid #b00;
-}
-
@@ -105 +115 @@
-  border-left: 1px solid #d7d7d7;
-  border-bottom: 1px solid #d7d7d7;
+}
+
+.message-list div.replies.new
+{
+  border-right: 2px solid #b00;
+  border-left: 2px solid #b00;
+  border-bottom: 2px solid #b00;
-}
-
@@ -162 +179 @@
-  border: 1px dashed #b00;
-}
+
+.message-list div.replies li.new div.body
+{
+  border: 2px solid #b00;
+}
+
+.message-list div.set-display
+{
+  text-align: center;
+  margin-top: 2em;
+}
+
+.message-list div.set-display a
+{
+  margin: 0.5em;
+}

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

@@ -121 +121 @@
-        <tr>
-          <th class="sel">&nbsp;</th>
-th class="id">ID</th
-th class="name">Name</th
-th class="subject">Subject</th
-th class="description">Description</th
-th class="moderators">Moderators</th
+?cs call:sortable_th(discussion.order, discussion.desc, 'id', 'ID', discussion.href + '/forum' + '?') ?
+?cs call:sortable_th(discussion.order, discussion.desc, 'name', 'Name', discussion.href + '/forum' + '?') ?
+?cs call:sortable_th(discussion.order, discussion.desc, 'subject', 'Subject', discussion.href + '/forum' + '?') ?
+?cs call:sortable_th(discussion.order, discussion.desc, 'description', 'Description', discussion.href + '/forum' + '?') ?
+?cs call:sortable_th(discussion.order, discussion.desc, 'moderators', 'Moderators', discussion.href + '/forum' + '?') ?
-          <?cs if:discussion.groups.1.id ?>
-th class="group">Group</th
+?cs call:sortable_th(discussion.order, discussion.desc, 'forum_group', 'Group', discussion.href + '/forum' + '?') ?
-          <?cs /if ?>
-        </tr>

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

@@ -51 +51 @@
-        <tr>
-          <th class="sel">&nbsp;</th>
-th class="id">ID</th
-th class="name">Name</th
-th class="description">Description</th
+?cs call:sortable_th(discussion.order, discussion.desc, 'id', 'ID', discussion.href + '/group' + '?') ?
+?cs call:sortable_th(discussion.order, discussion.desc, 'name', 'Name', discussion.href + '/group' + '?') ?
+?cs call:sortable_th(discussion.order, discussion.desc, 'description', 'Description', discussion.href + '/group' + '?') ?
-        </tr>
-      </thead>

discussionplugin/0.9/tracdiscussion/templates/discussion-header.cs

@@ -1 +1 @@
-<?cs include "header.cs" ?>
-<?cs include "macros.cs" ?>
-
-<div id="ctxtnav" class="nav">

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

@@ +1 @@
+<?cs include "macros.cs" ?>
+
-<?cs def:display_group(group, forums) ?>
-  <table class="listing">
@@ -11 +13 @@
-      <?cs /if ?>
-      <tr>
-th class="id">ID</th
-th class="subject">Forum</th
-th class="moderators">Moderators</th
-th class="lasttopic">Last Topic</th
-th class="lastreply">Last Reply</th
-th class="founded">Founded</th
-th class="topics">Topics</th
-th class="replies">Replies</th
+?cs call:sortable_th(discussion.order, discussion.desc, 'id', 'ID', discussion.href + '?') ?
+?cs call:sortable_th(discussion.order, discussion.desc, 'subject', 'Forum', discussion.href + '?') ?
+?cs call:sortable_th(discussion.order, discussion.desc, 'moderators', 'Moderators', discussion.href + '?') ?
+?cs call:sortable_th(discussion.order, discussion.desc, 'lasttopic', 'Last Topic', discussion.href + '?') ?
+?cs call:sortable_th(discussion.order, discussion.desc, 'lastreply', 'Last Reply', discussion.href + '?') ?
+?cs call:sortable_th(discussion.order, discussion.desc, 'time', 'Founded', discussion.href + '?') ?
+?cs call:sortable_th(discussion.order, discussion.desc, 'topics', 'Topics', discussion.href + '?') ?
+?cs call:sortable_th(discussion.order, discussion.desc, 'replies', 'Replies', discussion.href + '?') ?
-      </tr>
-    </thead>

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

@@ -83 +83 @@
-<?cs /def ?>
-
+<?cs def:display_set_display() ?>
+  <div class="set-display">
+    <a href="<?cs var:discussion.href ?>?discussion_action=set-display;display=tree">Tree View</a>
+    <a href="<?cs var:discussion.href ?>?discussion_action=set-display;display=flat-desc">Flat View (newer first)</a>
+    <a href="<?cs var:discussion.href ?>?discussion_action=set-display;display=flat-asc">Flat View (older first)</a>
+  </div>
+<?cs /def ?>
+
-<?cs def:display_topic(messages) ?>
-  <?cs each:message = messages ?>
-
+ <?cs if:message.new ?>class="new"<?cs /if ?>
-      <a name="<?cs var:message.id ?>"></a>
-      <div class="id">
@@ -121 +129 @@
-      <?cs /if ?>
-    </li>
-args.discussion_action != 'delete') && (args.discussion_action != 'edit') && (args.discussion_action != 'post-edit'
+(args.discussion_action == 'add') || (args.discussion_action == 'quote') || (args.discussion_action == 'post-add')
-      <ul>
-        <?cs if:message.replies.0.id ?>
-          <?cs call:display_topic(message.replies) ?>
-        <?cs /if ?>
-args.discussion_action && (args.discussion_action != "delete") && (args.discussion_action != 'edit') && (args.discussion_action != 'post-edit'
+(args.discussion_action && (args.discussion_action == 'add') || (args.discussion_action == 'quote') || (args.discussion_action == 'post-add')
-          <?cs if:args.preview ?>
-            <?cs call:display_preview() ?>
@@ -150 +158 @@
-
-<?cs if:trac.acl.DISCUSSION_VIEW ?>
-  <a name="-1"></a>
-  <?cs if:!discussion.no_display && discussion.topic.id ?>
-
+
+
+
-      <div class="header">
-        <div class="subject">
@@ -190 +199 @@
-      <?cs /if ?>
-    </div>
-args.discussion_action != "delete") && (args.discussion_action != 'edit') && (args.discussion_action != 'post-edit'
-
+(args.discussion_action == 'add') || (args.discussion_action == 'quote') || (args.discussion_action == 'post-add')
+ <?cs if:discussion.topic.new ?>new<?cs /if ?>
-        <ul>
-          <?cs if:discussion.messages.0.id ?>
-            <?cs call:display_topic(discussion.messages) ?>
-          <?cs /if ?>
-args.discussion_action != "delete") && (args.discussion_action != 'edit') && (args.discussion_action != 'post-edit'
+(args.discussion_action == 'add') || (args.discussion_action == 'quote') || (args.discussion_action == 'post-add')
-            <?cs if:args.preview ?>
-              <?cs call:display_preview() ?>
@@ -205 +214 @@
-      </div>
-    <?cs /if ?>
+    <?cs call:display_set_display() ?>
-  <?cs else?>
-    <span>No discussion for this page created.</span>

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

@@ +1 @@
+<?cs include "macros.cs" ?>
-<?cs include "discussion-header.cs" ?>
-
@@ -12 +13 @@
-    <thead>
-      <tr>
-th class="id">ID</th
-th class="subject">Subject</th
-th class="author">Author</th
-th class="lastreply">Last Reply</th
-th class="founded">Founded</th
-th class="replies">Replies</th
+?cs call:sortable_th(discussion.order, discussion.desc, 'id', 'ID', discussion.href + '/' + discussion.forum.id + '?') ?
+?cs call:sortable_th(discussion.order, discussion.desc, 'subject', 'Subject', discussion.href + '/' + discussion.forum.id + '?') ?
+?cs call:sortable_th(discussion.order, discussion.desc, 'author', 'Author', discussion.href + '/' + discussion.forum.id + '?') ?
+?cs call:sortable_th(discussion.order, discussion.desc, 'lastreply', 'Last Reply', discussion.href + '/' + discussion.forum.id + '?') ?
+?cs call:sortable_th(discussion.order, discussion.desc, 'time', 'Founded', discussion.href + '/' + discussion.forum.id + '?') ?
+?cs call:sortable_th(discussion.order, discussion.desc, 'replies', 'Replies', discussion.href + '/' + discussion.forum.id + '?') ?
-      </tr>
-    </thead>