Changeset 1009

Timestamp:

07/08/06 09:39:04 (3 years ago)

Author:

Blackhex

Message:

DiscussionPlugin:

• Move topic feature added.
  

Files:

• discussionplugin/0.9/setup.py (modified) (1 diff)
• discussionplugin/0.9/tracdiscussion/admin.py (modified) (1 diff)
• discussionplugin/0.9/tracdiscussion/api.py (modified) (2 diffs)
• discussionplugin/0.9/tracdiscussion/core.py (modified) (2 diffs)
• discussionplugin/0.9/tracdiscussion/templates/message-list.cs (modified) (1 diff)
• discussionplugin/0.9/tracdiscussion/templates/topic-move.cs (added)

discussionplugin/0.9/setup.py

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

discussionplugin/0.9/tracdiscussion/admin.py

@@ -138 +138 @@
-
-            # Set new group
-env, self.
+
-
-            # Display forum list

discussionplugin/0.9/tracdiscussion/api.py

@@ -62 +62 @@
-# Set item functions
-
-env, 
+
-    if not group:
-        group = '0'
@@ -69 +69 @@
-    cursor.execute(sql, (group, forum))
-
-
+
+
+
+
+
+
+
-
-def get_groups(cursor, env, req, log):

discussionplugin/0.9/tracdiscussion/core.py

@@ -112 +112 @@
-                else:
-                    mode = 'message-delete'
+            elif action == 'move':
+                mode = 'topic-move'
+            elif action == 'post-move':
+                if submit:
+                    mode = 'topic-post-move'
+                else:
+                    mode = 'message-list'
-            else:
-                mode = 'message-list'
@@ -236 +243 @@
-              self.log, forum['id'])
-            mode = 'topic-list'
+        elif mode == 'topic-move':
+            req.perm.assert_permission('DISCUSSION_MODERATE')
+
+            # Check if user can moderate
+            if not is_moderator:
+                raise PermissionError('Forum moderate')
+
+            # Display change forum form
+            req.hdf['discussion.href'] = self.env.href.discussion(forum['id'], topic['id'])
+            req.hdf['discussion.forums'] = get_forums(cursor, self.env, req, self.log)
+        elif mode == 'topic-post-move':
+            req.perm.assert_permission('DISCUSSION_MODERATE')
+
+            # Check if user can moderate
+            if not is_moderator:
+                raise PermissionError('Forum moderate')
+
+            # Get form values
+            new_forum = req.args.get('new_forum')
+            self.log.debug(new_forum)
+
+            # Set new forum
+            set_forum(cursor, self.log, topic['id'], new_forum)
+
+            # Display topics
+            req.hdf['discussion.href'] = self.env.href.discussion(forum['id'])
+            req.hdf['discussion.topics'] = get_topics(cursor, self.env, req,
+              self.log, forum['id'])
+            mode = 'topic-list'
-        elif mode == 'topic-delete':
-            req.perm.assert_permission('DISCUSSION_MODERATE')

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

@@ -140 +140 @@
-      <input type="hidden" name="reply" value="-1">
-    </form>
+    <form method="get" action="<?cs var:discussion.href ?>">
+      <input type="submit" name="movetopic" value="Move Topic"/>
+      <input type="hidden" name="discussion_action" value="move"/>
+    </form>
-  </div>
-<?cs /if ?>