Changeset 274

Timestamp:

08/17/09 14:25:19 (14 years ago)

Author:

bas

Message:

See Changelog for details

Location:

trunk

Files:

• ChangeLog (modified) (2 diffs)
• debian/changelog (modified) (3 diffs)
• email2trac.py.in (modified) (2 diffs)

trunk/ChangeLog

@@ -6 +6 @@
 
     All Fixes by: Bas van der Vlies
+
+  * if alternate notify template is set then also set ticket id. It will show
+    up as ticket change, closes #142
+    Reported by: hju att jochenkuhl dot de
+    Fixed by: Bas van der Vlies
 
   * Error in urllib.quote(filename) could not handle unicode 
@@ -11 +16 @@
     Reported by: debacle at debian dot org
     Applied  by: Bas van der Vlies
+
+  * Fixed an error when debug is on and the body message contains unicode
+    strings, closes #144
+    Reported by: trumbitta at gmail dot com
+    Applied by: Bas van der Vlies
 
 2009-04-09

trunk/debian/changelog

@@ -1 @@
-email2trac (0.82-1) stable; urgency=low
+email2trac (0.82-2) stable; urgency=low
 
   * updated aclocal.m4 to support python versions 2.5 and 2.6, closes #137
@@ -6 +6 @@
 
     All Fixes by: Bas van der Vlies
+
+  * if alternate notify template is set then also set ticket id. It will show
+    up as ticket change, closes #142
+    Reported by: hju att jochenkuhl dot de
+    Fixed by: Bas van der Vlies
 
   * Error in urllib.quote(filename) could not handle unicode 
@@ -13 +18 @@
     Applied  by: Bas van der Vlies
 
- -- root <root@subtrac2.rc.sara.nl>  Thu, 04 Jun 2009 14:48:11 +0200
+  
+  * Fixed an error when debug is on and the body message contains unicode
+    strings, closes #144
+    Reported by: trumbitta at gmail dot com
+    Applied by: Bas van der Vlies
+
+ -- Bas van der Vlies <basv@sara.nl>  Thu, 04 Jun 2009 14:48:11 +0200
 
 email2trac (0.80-1) stable; urgency=low

trunk/email2trac.py.in

@@ -391 +391 @@
                 if not message_body:
                         message_body = '(None)'
+
+                message_body = message_body.encode('utf-8')
+                #message_body = unicode(message_body, 'iso-8859-15')
+
                 fx.write(message_body)
                 fx.close()
@@ -831 +835 @@
                 #
                 if self.notify_template:
-                        tkt['id'] = ticket_id 
+                        tkt['id'] = self.id
                         changed = True