Changeset 653

Timestamp:

04/08/14 10:26:59 (9 years ago)

Author:

bas

Message:

added two patches:

1) applied lower to an object instead of string, closes #340
2) bug in custom field initialization, see #340

Location:

trunk

Files:

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

trunk/ChangeLog

@@ +1 @@
+2.8.1
+  * There was a case where the lower method on a string was referenced as an object instead of 
+    actually making a method call, closes #340
+    Author: ianyh
+    Applied by: Bas van der Vlies
+
+  * Custom ticket fields were not properly initialized, closes #338
+    Author: ivanelsonnunes add gmail dot com
+    Applied by: Bas van der Vlies
+
+  * 
 2.8.0
   * Also made delete_spam virtual env aware

trunk/debian/changelog

@@ +1 @@
+email2trac (2.8.1-1) stable; urgency=low
+
+  * See Changelog 
+
+ -- Bas van der Vlies <bas.vandervlies@surfsara.nl>  Tue, 08 Apr 2014 10:01:51 +0200
+
 email2trac (2.8.0-1) stable; urgency=low
 

trunk/email2trac.py.in

@@ -839 +839 @@
             cc_list = tkt['cc'].split(',')
             for cc in cc_list:
-                if self.email_addr.lower() in cc.lower.strip():
+                if self.email_addr.lower() in cc.lower().strip():
                     self.logger.debug('ALLOW, %s is in the CC' %(self.email_addr))
 
@@ -1115 +1115 @@
             ## default trac value
             #
+            CUSTOM_FIELD = False
             if not field.get('custom'):
                 value = self.get_config('ticket', 'default_%s' %(name) )
@@ -1124 +1125 @@
 
             else:
-                ##  Else get the default value for reporter
+                ##  Else get the default value for custom fields
                 #
+                CUSTOM_FIELD = True
                 value = field.get('value')
                 options = field.get('options')
@@ -1153 +1155 @@
                 self.print_unicode(s)
 
+            else:
+                ## custom fields need some initialisation
+                #
+                if CUSTOM_FIELD:
+                    user_dict[name] = ''
+                    
         self.update_ticket_fields(ticket, user_dict, new=1)
 
         if 'status' not in user_dict.keys():
             ticket['status'] = 'new'
-
 
     def ticket_update_by_subject(self, subject):

trunk/email2trac.spec

@@ -1 +1 @@
 Summary: Utilities for converting emails to trac tickets
 Name: email2trac
-Version: 2.8.0
+Version: 2.8.1
 Release: 1
 License: Apache License 2.0