Changeset 790

Timestamp:

05/26/06 11:59:41 (3 years ago)

Author:

Blackhex

Message:

DiscussionPlugin:

Whole forum deletion and showing last reply time.

Files:

• discussionplugin/0.9/tracdiscussion/core.py (modified) (14 diffs)
• discussionplugin/0.9/tracdiscussion/htdocs/css/discussion.css (modified) (2 diffs)
• discussionplugin/0.9/tracdiscussion/templates/discussion-header.cs (modified) (3 diffs)
• discussionplugin/0.9/tracdiscussion/templates/forum-add.cs (modified) (1 diff)
• discussionplugin/0.9/tracdiscussion/templates/forum-list.cs (modified) (6 diffs)
• discussionplugin/0.9/tracdiscussion/templates/message-list.cs (modified) (7 diffs)
• discussionplugin/0.9/tracdiscussion/templates/topic-add.cs (modified) (2 diffs)
• discussionplugin/0.9/tracdiscussion/templates/topic-list.cs (modified) (3 diffs)

discussionplugin/0.9/tracdiscussion/core.py

@@ -5 +5 @@
-from trac.Timeline import ITimelineEventProvider
-from trac.perm import IPermissionRequestor
-
+, pretty_timedelta
-import re, os, time
-
@@ -16 +16 @@
-      IPermissionRequestor)
-
-    # ITimelineEventProvider methods
-#    def get_timeline_events(self, req, start, stop, filters):
-#        if 'discussion' in filters:
-#            # TODO Complete timeline magic
-#            pass
-#
-#    def get_timeline_filters(self, req):
-#        if req.perm.has_permission('DISCUSSION_VIEW'):
-#            yield ('discussion', 'Discussion changes')
-
-    # IPermissionRequestor methods
-    def get_permission_actions(self):
@@ -52 +42 @@
-    # IRequestHandler methods
-    def match_request(self, req):
-[a-zA-Z]+[-a-zA-Z]
+\d
-          req.path_info)
-        if match:
@@ -115 +105 @@
-                    mode = 'message-list'
-            elif action == 'delete':
-
+
+
+
+
-            else:
-                mode = 'message-list'
@@ -130 +123 @@
-                else:
-                    mode = 'topic-post-add'
+            elif action == 'delete':
+                mode = 'forum-delete'
-            else:
-                # Display list of topics
@@ -163 +158 @@
-            moderators = req.args.get('moderators').split(' ')
-
- and display forum list
+
-            self.add_forum(cursor, name, subject, description, moderators)
+
+            # Display forum list
+            req.hdf['discussion.forums'] = self.get_forums(cursor, req)
+            mode = 'forum-list'
+        elif mode == 'forum-delete':
+            req.perm.assert_permission('DISCUSSION_MODIFY')
+
+            # Delete current forum
+            self.delete_forum(cursor, forum['id'])
+
+            # Display forum list
-            req.hdf['discussion.forums'] = self.get_forums(cursor, req)
-            mode = 'forum-list'
@@ -194 +200 @@
-            # Add new topic and display topic list
-            self.add_topic(cursor, forum['id'], subject, author, body)
+            req.hdf['discussion.topics'] = self.get_topics(cursor, forum['id'],
+              req)
+            mode = 'topic-list'
+        elif mode == 'topic-delete':
+            req.perm.assert_permission('DISCUSSION_MODERATE')
+
+            # Delete message
+            self.delete_topic(cursor, forum['id'], topic['id'])
+
+            # Display topics
-            req.hdf['discussion.topics'] = self.get_topics(cursor, forum['id'],
-              req)
@@ -232 +248 @@
-              topic['id'], req)
-            mode = 'message-list'
-
-        elif mode == 'message-delete':
-            req.perm.assert_permission('DISCUSSION_MODERATE')
-
-            # Get request value
-            reply = req.args.get('reply')
-
-            # Delete message
-            self.delete_message(cursor, forum['id'], topic['id'], reply)
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-        req.hdf['discussion.forum'] = forum
@@ -285 +292 @@
-        columns = ('name', 'moderators', 'id', 'time', 'subject', 'description')
-        cursor.execute('SELECT name, moderators, id, time, subject, description'
-name=
+id = 
-        for row in cursor:
-            row = dict(zip(columns, row))
@@ -295 +302 @@
-    def get_forums(self, cursor, req):
-        columns = ('moderators', 'id', 'time', 'subject', 'name',
-
+, 'lastreply'
-        cursor.execute('SELECT moderators, id, time, subject, name,'
-          ' description, (SELECT COUNT(id) FROM topic t WHERE'
-          ' t.forum = forum.id), (SELECT COUNT(id) FROM message m WHERE m.forum'
-
+
+
-        forums = []
-        for row in cursor:
@@ -305 +313 @@
-            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'
-            row['time'] = format_datetime(row['time'])
-            forums.append(row)
@@ -310 +322 @@
-
-    def get_topics(self, cursor, forum, req):
-
+
+
-        cursor.execute('SELECT id, forum, time, subject, body, author, (SELECT'
-
+
+
-          ' WHERE forum = %s ORDER BY time', [forum])
-        topics = []
@@ -319 +333 @@
-            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)
@@ -372 +390 @@
-          (forum, topic, replyto, str(int(time.time())), author, body))
-
+    def delete_forum(self, cursor, forum):
+        cursor.execute('DELETE FROM message WHERE forum = "%s"' % (forum))
+        cursor.execute('DELETE FROM topic WHERE forum = "%s"' % (forum))
+        cursor.execute('DELETE FROM forum WHERE id = "%s"' % (forum))
+
+    def delete_topic(self, cursor, forum, topic):
+        cursor.execute('DELETE FROM message WHERE forum = "%s" AND topic = "%s"'
+          % (forum, topic))
+        cursor.execute('DELETE FROM topic WHERE id = "%s"' % (topic))
+
-    def delete_message(self, cursor, forum, topic, message):
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+

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

@@ -38 +38 @@
-}
-
-.moderators, .forum-list .lastreply, .forum-list 
-.topics, .forum-list 
+td.moderators, .forum-list td.lastreply, .forum-list td
+td.topics, .forum-list td
-{
-  text-align: center;
@@ -50 +50 @@
-
-/* Topic list */
-
+
+
-{
-  text-align: center;

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

@@ -5 +5 @@
-  <h2>Wiki Navigation</h2>
-  <ul>
-name
+id
-      <?cs if:discussion.topic.id ?>
-        <li>
@@ -12 +12 @@
-        <?cs if:discussion.message.id ?>
-          <li>
-name
+id
-              <?cs var:discussion.forum.subject ?>
-            </a>
-          </li>
-          <li class="last">
-name
+id
-              <?cs var:discussion.topic.subject ?>
-            </a>
@@ -23 +23 @@
-        <?cs else ?>
-          <li class="last">
-name
+id
-              <?cs var:discussion.forum.subject ?>
-            </a>

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

@@ -34 +34 @@
-      <input type="submit" name="submit" value="Submit"/>
-      <input type="submit" name="cancel" value="Cancel"/>
+      <input type="hidden" name="action" value="post-add"/>
-    </div>
-    <input type="hidden" name="action" value="post-add"/>
-  </fieldset>
-</form>

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

@@ -17 +17 @@
-      <tr class="<?cs if:name(forum) % #2 ?>even<?cs else ?>odd<?cs /if ?>">
-        <td class="title">
-name
+id
-            <div class="subject"><?cs var:forum.subject ?></div>
-            <div class="description"><?cs var:forum.description ?></div>
@@ -23 +23 @@
-        </td>
-        <td class="moderators">
-name
+id
-            <div class="row">
-              <div class="cell"><?cs var:forum.moderators ?></div>
@@ -30 +30 @@
-        </td>
-        <td class="lastreply">
-name
+id
-            <div class="row">
-Not implemented
+<?cs var:forum.lastreply ?>
-            </div>
-          </a>
-        </td>
-        <td class="founded">
-name
+id
-            <div class="row">
-              <div class="cell"><?cs var:forum.time ?></div>
@@ -44 +44 @@
-        </td>
-        <td class="topics">
-name
+id
-            <div class="row">
-              <div class="cell"><?cs var:forum.topics ?></div>
@@ -51 +51 @@
-        </td>
-        <td class="replies">
-name
+id
-            <div class="row">
-              <div class="cell"><?cs var:forum.replies ?></div>
@@ -63 +63 @@
-
-<?cs if:trac.acl.DISCUSSION_MODIFY ?>
-form method="post" action="<?cs var:trac.href.discussion ?>
-div class="buttons
+div class="buttons
+form method="post" action="<?cs var:trac.href.discussion ?>
-      <input type="submit" name="newforum" value="New Forum"/>
-</div
-input type="hidden" name="action" value="add"/
-form
+  <input type="hidden" name="action" value="add"/
+/form
+div
-<?cs /if ?>
-

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

@@ -18 +18 @@
-         Reply:
-      </legend>
-name
+id
-        <div class="field">
-          <label for="author">Author:</label><br/>
@@ -30 +30 @@
-          <input type="submit" name="preview" value="Preview"/>
-          <input type="submit" name="submit" value="Reply"/>
-name
+id
-        </div>
-        <input type="hidden" name="reply" value="<?cs var:args.reply ?>"/>
@@ -46 +46 @@
-      </div>
-      <div class="controls">
-name
+id
-        <?cs if:trac.acl.DISCUSSION_MODERATE ?>
-name
+id
-        <?cs /if ?>
-      </div>
@@ -55 +55 @@
-      </div>
-    </li>
-
+|| (args.action == "post-add") 
-      <ul>
-        <?cs call:display_topic(message.replies) ?>
@@ -81 +81 @@
-    </div>
-    <div class="controls">
-name
+id
-    </div>
-    <div class="author">
@@ -87 +87 @@
-    </div>
-  </div>
-
+|| (args.action == "post-add") 
-    <div class="replies">
-      <ul>
@@ -103 +103 @@
-
-<?cs if:trac.acl.DISCUSSION_MODERATE ?>
-form method="post" action="<?cs var:trac.href.discussion ?>/<?cs var:discussion.forum.name ?>/<?cs var:discussion.topic.id ?>
-div class="buttons
-
-</div
-<input type="hidden" name="action" value="delete"/
-input type="hidden" name="reply" value="-1"
-form
+div class="buttons
+form method="post" action="<?cs var:trac.href.discussion ?>/<?cs var:discussion.forum.id ?>/<?cs var:discussion.topic.id ?>
+ onClick="return confirm('Do you realy want to delete this topic?')"
+  <input type="hidden" name="action" value="delete"/
+  <input type="hidden" name="reply" value="-1"
+/form
+div
-<?cs /if ?>
-

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

@@ -21 +21 @@
-<?cs /if ?>
-
-name
+id
-  <fieldset>
-    <legend>
@@ -42 +42 @@
-      <input type="submit" name="submit" value="Submit"/>
-      <input type="submit" name="cancel" value="Cancel"/>
+      <input type="hidden" name="action" value="post-add"/>
-    </div>
-    <input type="hidden" name="action" value="post-add"/>
-  </fieldset>
-</form>

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

@@ -12 +12 @@
-        <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>
@@ -20 +21 @@
-        <tr class="<?cs if:name(topic) % #2 ?>even<?cs else ?>odd<?cs /if ?>">
-          <td class="subject">
-name
+id
-              <div class="subject"><?cs var:topic.subject ?></div>
-            </a>
-          </td>
-          <td class="author">
-name
+id
-              <div class="author" ><?cs var:topic.author ?></div>
-            </a>
-          </td>
+          <td class="lastreply">
+            <a href="<?cs var:trac.href.discussion ?>/<?cs var:discussion.forum.id ?>/<?cs var:topic.id ?>">
+              <div class="lastreply"><?cs var:topic.lastreply ?></div>
+            </a>
+          </td>
-          <td class="founded">
-name
+id
-              <div class="founded" ><?cs var:topic.time ?></div>
-            </a>
-          </td>
-          <td class="replies">
-name
+id
-              <div class="replies" ><?cs var:topic.replies ?></div>
-            </a>
@@ -44 +50 @@
-  </table>
-
-form method="post" action="<?cs var:trac.href.discussion ?>/<?cs var:discussion.forum.name ?>
-div class="buttons
+div class="buttons
+form method="post" action="<?cs var:trac.href.discussion ?>/<?cs var:discussion.forum.id ?>
-      <input type="submit" name="newtopic" value="New Topic"/>
-
-
-
+
+
+
+
+
+
+
+
+
-
-<?cs include "footer.cs" ?>