Changeset 668

Timestamp:

05/12/15 17:44:52 (9 years ago)

Author:

bas

Message:

suppoer discussionplugin 0.9dev, older versions are noi supported anymore, see #365

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• email2trac.py.in (modified) (12 diffs)

trunk/ChangeLog

@@ +1 @@
+2.9.X:
+   * email2trac now supports discussionplugin v0.9dev. The older vcersions are not supported anymore, closes #365 
+    Author: ???
+    Applied by: Bas van der Vlies
+
 2.8.9:
    * Added a new parameter only save email and removed some obsolete code in ave_email_for_debug,

trunk/email2trac.py.in

@@ -1544 +1544 @@
         #
         api = self.env[DiscussionApi]
-        context = self._create_context(content, subject)
+        args = {'forum' : self.id}
+        context = self._create_context(api, args, content, subject)
 
         ## Get forum for new topic.
         #
-        forum = api.get_forum(context, self.id)
+        forum = context.forum
 
         if not forum:
@@ -1565 +1566 @@
         #
         self._add_topic(api, context, topic)
-        self.db.commit()
 
     def discussion_topic_reply(self, content, subject):
@@ -1579 +1579 @@
         #
         api = self.env[DiscussionApi]
-        context = self._create_context(content, subject)
+        args = {'topic' : self.id}
+        context = self._create_context(api, args, content, subject)
 
         ## Get replied topic.
         #
-        topic = api.get_topic(context, self.id)
+        topic = context.topic
 
         if not topic:
@@ -1600 +1601 @@
         #
         self._add_message(api, context, message)
-        self.db.commit()
 
     def discussion_message_reply(self, content, subject):
@@ -1614 +1614 @@
         #
         api = self.env[DiscussionApi]
-        context = self._create_context(content, subject)
+        args = {'message' : self.id}
+        context = self._create_context(api, args, content, subject)
 
         ## Get replied message.
         #
-        message = api.get_message(context, self.id)
+        message = context.message
 
         if not message:
@@ -1635 +1636 @@
         #
         self._add_message(api, context, message)
-        self.db.commit()
-
-    def _create_context(self, content, subject):
+
+    def _create_context(self, api, args, content, subject):
 
         ## Import modules.
@@ -1643 +1643 @@
         from trac.mimeview import Context
         from trac.web.api import Request
+        from trac.web.session import Session
         from trac.perm import PermissionCache
 
@@ -1668 +1669 @@
         req.perm = PermissionCache(self.env, self.author)
         req.locale = None
+        req.args = args
+        req.session = Session(env, req)
 
         ## Create and return context.
@@ -1673 +1676 @@
         context = Context.from_request(req)
         context.realm = 'discussion-email2trac'
-        context.cursor = self.db.cursor()
+        context.db = self.env.get_db_cnx()
         context.content = content
         context.subject = subject
@@ -1682 +1685 @@
         context.content_parts = self.unique_attachment_names(
           context.content_parts)
+
+        api._prepare_context(context)
 
         return context
@@ -1700 +1705 @@
         ## Add a new topic.
         #
-        api.add_topic(context, topic)
+        new_topic_id = api.add_topic(context, topic)
 
         ## Get inserted topic with new ID.
         #
-        topic = api.get_topic_by_time(context, topic['time'])
+        topic = api.get_topic(context, new_topic_id)
 
         ## Attach attachments.
@@ -1731 +1736 @@
         ## Add message.
         #
-        api.add_message(context, message)
+        new_msg_id = api.add_message(context, message)
 
         ## Get inserted message with new ID.
         #
-        message = api.get_message_by_time(context, message['time'])
+        message = api.get_message(context, new_msg_id)
 
         ## Attach attachments.