Changeset 493 for trunk

Timestamp:

12/13/10 11:23:52 (13 years ago)

Author:

bas

Message:

fixed some bugs in update_ticket_fields function, see #228

Location:

trunk

Files:

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

trunk/ChangeLog

@@ -41 +41 @@
      Author: thomas dot moschny add gmx dot de 
      Applied by: Bas van der Vlies
+
+   * Fixed some bugs in function update_ticket_fields:
+       - Can not clear values, repoterd by thomas dot moschny add gmx dot de
+             closes #228
+       - Values were updated regardless if there are not allowed for the ticket
+             field.
+     Author: Bas van der Vlies
 
 1.6.0 (2010-8-10)

trunk/debian/changelog

@@ +1 @@
+email2trac (1.7.0-2) stable; urgency=low
+
+  * See Changlog 
+
+ -- bas van der Vlies <bas@sara.nl>  Mon, 13 Dec 2010 11:22:15 +0100
+
 email2trac (1.7.0-1) stable; urgency=low
 

trunk/email2trac.py.in

@@ -659 +659 @@
                         - If the value supplied is valid for the ticket field.
                           If not then there are two options:
-                           1) Skip the value (new_ticket=None)
-                           2) Set default value for field (new_ticket=1)
+                           1) Skip the value (new=None)
+                           2) Set default value for field (new=1)
                 """
                 self.logger.debug("function update_ticket_fields")
@@ -681 +681 @@
 
                         except KeyError:
-                                sys_dict[field['name']] = None
+                                #sys_dict[field['name']] = None
                                 pass
 
@@ -706 +706 @@
                                 
 
-                        if sys_dict.has_key(field):
-
-                                ## Check if value is an allowed system option, if TypeError then
-                                #  every value is allowed
-                                #
-                                try:
-                                        if value in sys_dict[field]:
-                                                ticket[field] = value
-                                        else:
-                                                ## Must we set a default if value is not allowed
-                                                #
-                                                if new:
-                                                        value = self.get_config('ticket', 'default_%s' %(field) )
-
-                                except TypeError:
-                                        pass
-
+                        ## Check if every value is allowed for this filed
+                        # 
+                        if sys_dict.has_key(field): 
+
+                                if value in sys_dict[field]: 
+                                        ticket[field] = value
+                                else:
+                                        ## Must we set a default if value is not allowed
+                                        #
+                                        if new:
+                                                value = self.get_config('ticket', 'default_%s' %(field) )
+
+                        else:
                                 ## Only set if we have a value
                                 #
-                                if value:
-                                        ticket[field] = value
-
-                                if self.parameters.debug:
-                                        s = 'ticket_field\t %s = %s' %(field,  ticket[field]) 
-                                        self.print_unicode(s)
+                                #if value:
+                                #       ticket[field] = value
+                                ticket[field] = value
+
+                        if self.parameters.debug:
+                                s = 'ticket_field\t %s = %s' %(field,  ticket[field]) 
+                                self.print_unicode(s)
 
         def ticket_update(self, m, id, spam):
@@ -853 +850 @@
                         self.logger.debug('email triggers workflow disabled')
 
-                ## Must we update some ticket fields properties via subjectline
+                ## Must we update some ticket fields properties via subject line
                 #
                 if update_fields:
@@ -909 +906 @@
                                         value = None 
                         else:
-                                ##  Else we get the default value for reporter
+                                ##  Else get the default value for reporter
                                 #
                                 value = field.get('value')