Changeset 506

Timestamp:

01/10/11 14:06:35 (12 years ago)

Author:

bas

Message:

fixed mailto link buf for trac 0.12

Location:

trunk

Files:

• ChangeLog (modified) (2 diffs)
• debian/changelog (modified) (1 diff)
• debian/compat (modified) (1 diff)
• email2trac.py.in (modified) (3 diffs)
• email2trac.spec (modified) (1 diff)

trunk/ChangeLog

@@ -1 @@
-1.X.X (2010-XX-XX)
+2.0.1 (2010-XX-XX)
    * An email adress can match multiple trac accounts, closes #218
      Author: Konstantin Ryabitsev <icon add mricon dot com>
@@ -68 +68 @@
      Applied by: Bas van der Vlies
 
+   * Fixed mailto link for trac 0.11 and 0.12. Use the mailto tag in stead of
+     an html tag. The html tag does not work for trac 0.12
+     Reported by: Wim Rijks
+     Author: Bas van der Vlies
+    
 1.6.0 (2010-8-10)
    * Fixed an Unicode error in strip_quotes

trunk/debian/changelog

@@ +1 @@
+email2trac (2.0.1-1) stable; urgency=low
+
+  * mailto fix for trac 0.12
+
+ -- Bas van der Vlies <basv@sara.nl>  Mon, 10 Jan 2011 11:12:01 +0100
+
 email2trac (2.0.0-1) stable; urgency=low
 

trunk/debian/compat

@@ -1 @@
-4
+5

trunk/email2trac.py.in

@@ -2075 +2075 @@
                 This function returns a HTML mailto tag with the ticket id and author email address
                 """
+                self.logger.debug("function html_mailto_link")
                 if not self.author:
                         author = self.email_addr
@@ -2085 +2086 @@
                 ## use urllib to escape the chars
                 #
-                s = 'mailto:%s?Subject=%s&Cc=%s' %( 
+                s = '%s?Subject=%s&Cc=%s' %( 
                        urllib.quote(self.email_addr), 
                            urllib.quote('Re: #%s: %s' %(self.id, subject)),
@@ -2091 +2092 @@
                            )
 
-                s = '\r\n{{{\r\n#!html\r\n<a\r\n href="%s">Reply to: %s\r\n</a>\r\n}}}\r\n' %(s, author)
+                if self.VERSION in [ 0.10 ]:
+                        s = '\r\n{{{\r\n#!html\r\n<a\r\n href="mailto:%s">Reply to: %s\r\n</a>\r\n}}}\r\n' %(s, author)
+                else:
+                        s = '[mailto:"%s" Reply to: %s]' %(s, author)
+
+                self.logger.debug("\tmailto link %s" %s)
                 return s
 

trunk/email2trac.spec

@@ -1 +1 @@
 Summary: Utilities for converting emails to trac tickets
 Name: email2trac
-Version: 2.0.0
+Version: 2.0.1
 Release: 1
 License: GPL