Changeset 1077

Timestamp:

08/01/06 19:05:28 (2 years ago)

Author:

Blackhex

Message:

DiscussionPlugin:

• Edit posts functionality.
  
• Bug #561 fix.
  

Files:

• discussionplugin/0.9/tracdiscussion/api.py (modified) (14 diffs)
• discussionplugin/0.9/tracdiscussion/core.py (modified) (1 diff)
• discussionplugin/0.9/tracdiscussion/htdocs/css/discussion.css (modified) (7 diffs)
• discussionplugin/0.9/tracdiscussion/templates/forum-add.cs (modified) (4 diffs)
• discussionplugin/0.9/tracdiscussion/templates/message-list.cs (modified) (9 diffs)

discussionplugin/0.9/tracdiscussion/api.py

@@ -2 +2 @@
-from trac.web.chrome import add_stylesheet
-from trac.wiki import wiki_to_html, wiki_to_oneliner
+from trac.perm import PermissionError
-from trac.util import format_datetime, pretty_timedelta, escape, unescape, \
-  Markup
-from trac.util import Markup, format_datetime
-import time
-
@@ -127 +127 @@
-                    else:
-                        return ['message-post-add', 'message-list']
+                elif action == 'edit':
+                    return ['message-edit', 'message-list']
+                elif action == 'post-edit':
+                    if preview:
+                        return ['message-list']
+                    else:
+                        return ['message-post-edit', 'message-list']
-                elif action == 'delete':
-                    return ['message-delete', 'message-list']
@@ -141 +148 @@
-                    else:
-                        return ['message-post-add', 'message-list']
+                elif action == 'edit':
+                    return ['message-edit', 'message-list']
+                elif action == 'post-edit':
+                    if preview:
+                        return ['message-list']
+                    else:
+                        return ['message-post-edit', 'message-list']
-                elif action == 'delete':
-                    return ['message-delete', 'message-list']
@@ -158 +172 @@
-                    else:
-                        return ['message-post-add', 'message-list']
+                elif action == 'edit':
+                    return ['topic-edit', 'message-list']
+                elif action == 'post-edit':
+                    if preview:
+                        return ['message-list']
+                    else:
+                        return ['topic-post-edit', 'message-list']
-                elif action == 'delete':
-                    self.req.hdf['discussion.no_display'] = True
@@ -173 +194 @@
-                    else:
-                        return ['message-post-add', 'message-list']
+                elif action == 'edit':
+                    return ['topic-edit', 'message-list']
+                elif action == 'post-edit':
+                    if preview:
+                        return ['message-list']
+                    else:
+                        return ['topic-post-edit', 'message-list']
-                elif action == 'delete':
-                    return ['topic-delete', 'topic-list']
@@ -242 +270 @@
-        for mode in modes:
-            self.log.debug('doing %s mode action' % (mode,))
-            self.log.debug(forum)
-            if mode == 'group-list':
-                self.req.perm.assert_permission('DISCUSSION_VIEW')
+
+                # Display groups.
-                self.req.hdf['discussion.groups'] = self.get_groups()
+
-            elif mode == 'admin-group-list':
-                self.req.perm.assert_permission('DISCUSSION_ADMIN')
+
+                # Display groups.
-                if group:
-                    self.req.hdf['discussion.name'] = group['name']
-                    self.req.hdf['discussion.description'] = group['description']
-                self.req.hdf['discussion.groups'] = self.get_groups()
+
-            elif mode == 'group-add':
-                self.req.perm.assert_permission('DISCUSSION_ADMIN')
+
-            elif mode == 'group-post-add':
-                self.req.perm.assert_permission('DISCUSSION_ADMIN')
-
-
-
+
+
+
+
+
+
+
+
-            elif mode == 'group-post-edit':
-                self.req.perm.assert_permission('DISCUSSION_ADMIN')
-
-
-
-
+
+
+
+
+
+
+
+
+
-            elif mode == 'group-delete':
-                self.req.perm.assert_permission('DISCUSSION_ADMIN')
+
-            elif mode == 'groups-delete':
-                self.req.perm.assert_permission('DISCUSSION_ADMIN')
+
+                # Get selected groups.
-                selection = self.req.args.get('selection')
-                if isinstance(selection, (str, unicode)):
-                    selection = [selection]
+
+                # Delete selected groups.
-                if selection:
-                    for group in selection:
-                        self.delete_group(group)
+
-            elif mode == 'forum-list':
-                self.req.perm.assert_permission('DISCUSSION_VIEW')
+
+                # Display forums.
-                self.req.hdf['discussion.groups'] = self.get_groups()
-                self.req.hdf['discussion.forums'] = self.get_forums()
+
-            elif mode == 'admin-forum-list':
-                self.req.perm.assert_permission('DISCUSSION_ADMIN')
+
+                # Display forums.
-                if forum:
-                    self.req.hdf['discussion.name'] = forum['name']
@@ -290 +345 @@
-                self.req.hdf['discussion.groups'] = self.get_groups()
-                self.req.hdf['discussion.forums'] = self.get_forums()
+
-            elif mode == 'forum-add':
-                self.req.perm.assert_permission('DISCUSSION_ADMIN')
+
+                # Display Add Forum form.
-                self.req.hdf['discussion.users'] = self.get_users()
-                self.req.hdf['discussion.groups'] = self.get_groups()
+
-            elif mode == 'forum-post-add':
-                self.req.perm.assert_permission('DISCUSSION_ADMIN')
+
-                # Get form values
-                new_name = Markup(self.req.args.get('name'))
@@ -307 +367 @@
-                if not isinstance(new_moderators, list):
-                     new_moderators = [new_moderators]
+
-                # Perform new forum add.
-                self.add_forum(new_name, new_author, new_subject,
-                   new_description, new_moderators, new_group)
+
-            elif mode == 'forum-post-edit':
-                self.req.perm.assert_permission('DISCUSSION_ADMIN')
+
-                # Get form values.
-                new_forum = self.req.args.get('forum')
@@ -323 +386 @@
-                if not isinstance(new_moderators, list):
-                    new_moderators = [new_moderators]
+
-                # Perform forum edit.
-                self.edit_forum(new_forum, new_name, new_subject,
-                  new_description, new_moderators, new_group)
+
-            elif mode == 'forum-delete':
-                self.req.perm.assert_permission('DISCUSSION_ADMIN')
+
+                # Delete forum
-                self.delete_forum(forum['id'])
+
-            elif mode == 'forums-delete':
-                self.req.perm.assert_permission('DISCUSSION_ADMIN')
+
+                # Get selected forums.
-                selection = self.req.args.get('selection')
-                if isinstance(selection, (str, unicode)):
-                    selection = [selection]
+
+                # Delete selected forums.
-                if selection:
-                    for forum in selection:
-                        self.delete_forum(forum)
+
-            elif mode == 'topic-list':
-                self.req.perm.assert_permission('DISCUSSION_VIEW')
+
+                # Display topics.
-                self.req.hdf['discussion.topics'] = self.get_topics(forum['id'])
+
-            elif mode == 'topic-add':
-                self.req.perm.assert_permission('DISCUSSION_APPEND')
-
-
-
-
+
+
+
+
+
+
+
+
-                    self.req.hdf['discussion.subject'] = wiki_to_oneliner(
-
-
-author,
-
-
-
+new_
+new_
+
+new_author,
+new_
+new_
-                      self.env, self.req)
+
-            elif mode == 'topic-quote':
-                self.req.perm.assert_permission('DISCUSSION_APPEND')
+
+                # Prepare old content.
-                lines = topic['body'].splitlines()
-                for I in xrange(len(lines)):
-                    lines[I] = '> %s' % (lines[I])
-                self.req.hdf['args.body'] = '\n'.join(lines)
+
-            elif mode == 'topic-post-add':
-                self.req.perm.assert_permission('DISCUSSION_APPEND')
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            elif mode == 'topic-move':
-                self.req.perm.assert_permission('DISCUSSION_MODERATE')
-                if not is_moderator:
-                    raise PermissionError('Forum moderate')
+
+                # Display Move Topic form
-                self.req.hdf['discussion.forums'] = self.get_forums()
+
-            elif mode == 'topic-post-move':
-                self.req.perm.assert_permission('DISCUSSION_MODERATE')
-                if not is_moderator:
-                    raise PermissionError('Forum moderate')
+
+                # Get form values
-                new_forum = self.req.args.get('new_forum')
+
+                # Move topic.
-                self.set_forum(topic['id'], new_forum)
+
-            elif mode == 'topic-delete':
-                self.req.perm.assert_permission('DISCUSSION_MODERATE')
-                if not is_moderator:
-                    raise PermissionError('Forum moderate')
+
+                # Delete topic.
-                self.delete_topic(topic['id'])
+
-            elif mode == 'message-list':
-                self.req.perm.assert_permission('DISCUSSION_VIEW')
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                      self.env, self.req)
-                self.req.hdf['discussion.messages'] = self.get_messages(topic['id'])
+
-            elif mode == 'message-quote':
-                self.req.perm.assert_permission('DISCUSSION_APPEND')
+
+                # Prepare old content.
-                lines = message['body'].splitlines()
-                for I in xrange(len(lines)):
-                    lines[I] = '> %s' % (lines[I])
-                self.req.hdf['args.body'] = '\n'.join(lines)
+
-            elif mode == 'message-post-add':
-                self.req.perm.assert_permission('DISCUSSION_APPEND')
-
-
+
+
+
+
+
+
-                if message:
-                    self.add_message(forum['id'], topic['id'], message['id'],
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            elif mode == 'message-delete':
-                self.req.perm.assert_permission('DISCUSSION_MODERATE')
-                if not is_moderator:
-                    raise PermissionError('Forum moderate')
+
+                # Delete message.
-                self.delete_message(message['id'])
-
@@ -494 +657 @@
-        sql = "UPDATE forum_group SET name = %s, description = %s WHERE id = %s"
-        self.log.debug(sql % (name, description, group))
-name, description
+escape(name), escape(description)
-
-    def edit_forum(self, forum, name, subject, description, moderators, group):
@@ -504 +667 @@
-        self.log.debug(sql % (name, subject, description, moderators,
-          group, forum))
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    # Get list functions
@@ -548 +725 @@
-        for row in self.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['moderators'] = wiki_to_oneliner(row['moderators'], self.env)
-            row['description'] = wiki_to_oneliner(row['description'], self.env)
@@ -630 +805 @@
-        self.cursor.execute(sql, (escape(name), escape(description)))
-
-
-    def add_forum(self, name, author, subject, description, moderators, group):
-        moderators = ' '.join(moderators)
@@ -656 +830 @@
-          author, body))
-        self.cursor.execute(sql, (forum, topic, replyto, int(time.time()),
-Markup(body)
+body
-
-    # Delete items functions

discussionplugin/0.9/tracdiscussion/core.py

@@ -3 +3 @@
-from trac.web.chrome import INavigationContributor, ITemplateProvider
-from trac.web.main import IRequestHandler
-, PermissionError
+
-import re
-

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

@@ -51 +51 @@
-}
-
-
-/* Topic list */
-.topic-list td.id, .topic-list td.author, .topic-list td.lastreply,
@@ -68 +67 @@
-{
-  margin: 2em;
-
-
-
-
+
-  border: 1px solid #d7d7d7;
-}
-
-
+div
-{
-  font-weight: bold;
@@ -84 +80 @@
-}
-
-
+
+
+
+
+
+
-{
-  margin: 1em;
@@ -90 +91 @@
-
-/* Message list reply tree */
-
+div
-{
-  margin: 0.2em;
@@ -98 +99 @@
-{
-  display: block;
-
+
+
-  padding: 0.25em;
-  border-right: 1px solid #d7d7d7;
@@ -148 +150 @@
-}
-
-.topic 
+div
-{
-  margin: 0em;
@@ -156 +158 @@
-}
-
-.topic .replies 
+div.replies li
-{
-  border: 1px dashed #b00;

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

@@ -9 +9 @@
-    <div class="field">
-      <label for="name">Name:</label><br/>
-
+id="name" 
-    </div>
-    <div class="field">
-      <label for="subject">Subject:</label><br/>
-
+id="subject" 
-    </div>
-    <div class="field">
-      <label for="description">Description:</label><br/>
-
+id="description" 
-    </div>
-    <div class="field">
-      <label for="moderators">Moderators:</label><br/>
-      <?cs if:discussion.users.0 ?>
-
+id="moderators" 
-          <?cs each:user = discussion.users ?>
-            <option value="<?cs var:user ?>"><?cs var:user ?></option>
@@ -28 +28 @@
-        </select><br/>
-      <?cs else ?>
-
+id="moderators" 
-      <?cs /if ?>
-    </div>
@@ -34 +34 @@
-      <div class="group">
-        <label for="group">Forum Group:</label><br/>
-
+id="group" 
-          <?cs each:group = discussion.groups ?>
-            <option value="<?cs var:group.id ?>"><?cs var:group.name ?></option>
@@ -41 +41 @@
-      </div>
-    <?cs else ?>
-
+id="group" 
-    <?cs /if ?>
-    <div class="buttons">

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

@@ -2 +2 @@
-  <li class="preview">
-    <a name="preview"></a>
+    <div class="id">
+        Message #??
+    </div>
-    <div class="body">
-      <?cs var:discussion.body ?>
@@ -16 +19 @@
-<?cs /def ?>
-
-
+reply_
-  <li class="reply">
-    <fieldset>
@@ -27 +30 @@
-          <label for="author">Author:</label><br/>
-          <?cs if:args.author ?>
-
+id="author" 
-          <?cs else ?>
-
+id="author" 
-          <?cs /if ?>
-        </div>
-        <div class="field">
-          <label for="body">Body:</label><br/>
-
+id="body" 
-        </div>
-        <div class="buttons">
@@ -48 +51 @@
-    </fieldset>
-  </li>
+<?cs /def ?>
+
+<?cs def:display_edit_form() ?>
+  <fieldset>
+    <a name="reply"></a>
+    <legend>
+      Edit:
+    </legend>
+    <form method="get" action="<?cs var:discussion.href ?>#preview">
+      <?cs if:!args.message ?>
+        <div class="field">
+          <label for="subject">Subject:</label><br/>
+          <input type="text" id="subject" name="subject" value="<?cs var:args.subject ?>"/><br/>
+        </div>
+      <?cs /if ?>
+      <div class="field">
+        <label for="body">Body:</label><br/>
+        <textarea id="body" name="body" class="wikitext" rows="10" cols="78"><?cs var:args.body ?></textarea>
+      </div>
+      <div class="buttons">
+        <input type="submit" name="preview" value="Preview"/>
+        <input type="submit" name="submit" value="Edit"/>
+        <input type="button" name="cancel" value="Cancel" onclick="location.href = '<?cs var:discussion.href ?>#<?cs var:args.message ?>'"/>
+      </div>
+      <?cs if:args.message ?>
+        <input type="hidden" name="message" value="<?cs var:args.message ?>"/>
+      <?cs /if ?>
+      <input type="hidden" name="discussion_action" value="post-edit"/>
+    </form>
+  </fieldset>
-<?cs /def ?>
-
@@ -58 +91 @@
-      </div>
-      <div class="body">
-
+
+
+
+
+
-      </div>
-      <div class="controls">
@@ -64 +101 @@
-          <a href="<?cs var:discussion.href ?>?discussion_action=add;message=<?cs var:message.id ?>#reply">Reply</a>
-          <a href="<?cs var:discussion.href ?>?discussion_action=quote;message=<?cs var:message.id ?>#reply">Quote</a>
+          <?cs if:discussion.is_moderator || (message.author == discussion.authname) ?>
+            <a href="<?cs var:discussion.href ?>?discussion_action=edit;message=<?cs var:message.id ?>#reply">Edit</a>
+          <?cs /if ?>
-        <?cs /if ?>
-        <?cs if:trac.acl.DISCUSSION_MODERATE && discussion.is_moderator ?>
@@ -77 +117 @@
-        </div>
-      </div>
+      <?cs if:(args.message == message.id) && !args.submit && ((args.discussion_action == 'edit') || (args.discussion_action == 'post-edit')) ?>
+        <?cs call:display_edit_form() ?>
+      <?cs /if ?>
-    </li>
-discussion.messages.0.id || args.discussion_action && !args.submit && (args.discussion_action != "delete"
+message.replies.0.id || args.discussion_action && (args.discussion_action != 'delete') && (args.discussion_action != 'edit') && (args.discussion_action != 'post-edit'
-      <ul>
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-        <?cs /if ?>
-      </ul>
@@ -110 +155 @@
-      <div class="header">
-        <div class="subject">
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-          <?cs var:discussion.topic.body ?>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            <?cs call:display_topic(discussion.messages) ?>
-
+
+
+
-              <?cs call:display_preview() ?>
-            <?cs /if ?>
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-<?cs else ?>
-  <span>You have no rights to see this discussion.</span>
@@ -158 +219 @@
-    </form>
-    <?cs if:!discussion.no_navigation ?>
-/<?cs var:discussion.forum.id ?>/<?cs var:discussion.topic.id ?>
+
-        <input type="submit" name="movetopic" value="Move Topic"/>
-        <input type="hidden" name="discussion_action" value="move"/>