Changeset 2836

Timestamp:

11/28/07 22:55:48 (1 year ago)

Author:

Blackhex

Message:

• Bug #1268 fix.
  

Files:

• discussionplugin/0.10/tracdiscussion/api.py (modified) (5 diffs)
• discussionplugin/0.10/tracdiscussion/notification.py (modified) (2 diffs)
• discussionplugin/0.10/tracdiscussion/wiki.py (modified) (2 diffs)

discussionplugin/0.10/tracdiscussion/api.py

@@ -7 +7 @@
-from trac.perm import PermissionError
-from trac.util import format_datetime, pretty_timedelta
+from trac.util.text import to_unicode
-import time
-
@@ -386 +387 @@
-                req.hdf['discussion.order'] = order
-                req.hdf['discussion.desc'] = desc
-                self.log.debug(forum)
-                if forum:
-                    req.hdf['discussion.name'] = forum['name']
@@ -534 +534 @@
-
-                # Add topic.
-                self.log.debug(new_body)
-                self.add_topic(cursor, forum['id'], new_subject, new_time,
-                  new_author, new_body)
@@ -540 +539 @@
-                # Get new popic and notify about creation.
-                new_topic = self.get_topic_by_time(cursor, new_time)
-                self.log.debug(new_topic)
-                to = self.get_topic_to_recipients(cursor, new_topic['id'])
-                cc = self.get_topic_cc_recipients(cursor, new_topic['id'])
@@ -736 +734 @@
-        # Update this topic visit time and save to session.
-        visited[topic['id']] = int(time.time())
-
+to_
-
-        # Mark new topic.

discussionplugin/0.10/tracdiscussion/notification.py

@@ -3 +3 @@
-from trac.notification import NotifyEmail
-from trac.util import format_datetime
-
+, to_unicode
-
-class DiscussionNotifyEmail(NotifyEmail):
@@ -85 +85 @@
-        self.hdf.set_unescaped('discussion.body', body)
-        self.hdf.set_unescaped('discussion.link', link)
+        self.hdf.set_unescaped('discussion.project_name',
+          self.env.project_name)
+        self.hdf.set_unescaped('discussion.project_description',
+          self.env.project_description)
+        self.hdf.set_unescaped('discussion.project_url', self.env.project_url)
-
-        # Render body and send notification.
-
-
+
-        NotifyEmail.notify(self, id, subject)
-

discussionplugin/0.10/tracdiscussion/wiki.py

@@ -9 +9 @@
-from trac.util import format_datetime
-from trac.util.html import html
+from trac.util.text import to_unicode
-import time, re
-
@@ -66 +67 @@
-                req.args['forum'] = topic['forum']
-                req.args['topic'] = topic['id']
-req.hdf.render(api.render_discussion(req)[0]
+to_unicode(req.hdf.render(api.render_discussion(req)[0])
-        else:
-            raise TracError('Not implemented macro %s' % (name))