Changeset 597

Timestamp:

05/04/12 10:15:51 (12 years ago)

Author:

bas

Message:

renamed function set_reply_fields to set_cc_fields. So we can use it in ticket_update and resolved a bug that reporter email address was not stripped from CC fields, see #293

File:

• trunk/email2trac.py.in (modified) (9 diffs)

trunk/email2trac.py.in

@@ -390 +390 @@
                     
 
-    def set_reply_fields(self, ticket, message):
+    def set_cc_fields(self, ticket, message, update=False):
         """
         Set all the right fields for a new ticket
         """
-        self.logger.debug('function set_reply_fields')
-
-        ## Only use name or email adress
-        #
-        ticket['reporter'] = self.author
+        self.logger.debug('function set_cc_fields')
 
 
@@ -418 +414 @@
             #for n,e in to_addrs:
             #   to_list.append(e)
-                
-            ## Always Remove reporter email address from cc-list 
-            #
-            try:
-                cc_addrs.remove((self.author, self.email_addr))
-            except ValueError, detail:
-                pass
+
+            if update:
+                self.logger.debug("\tupdate cc-fields")
 
             for name,addr in cc_addrs:
@@ -431 +423 @@
                 #
                 if addr == self.trac_smtp_from:
-                    self.logger.debug("Skipping %s mail address for CC-field" %(addr))
+                    self.logger.debug("\tSkipping %s email address for CC-field, same as smtp_from address in trac.ini " %(addr))
                     continue
 
-                if email_cc:
-                    email_cc = '%s, %s' %(email_cc, addr)
+                ## Alwyas remove reporter email address
+                #
+                elif addr == self.email_addr:
+                    self.logger.debug("\tSkipping reporter email address for CC-field")
+                    continue
+
                 else:
-                    email_cc = addr
+                    if email_cc:
+                        email_cc = '%s, %s' %(email_cc, addr)
+                    else:
+                        email_cc = addr
 
             if email_cc:
-                self.logger.debug('set_reply_fields: %s' %email_cc)
-
+                self.logger.debug('\tCC fields: %s' %email_cc)
                 ticket['cc'] = self.email_to_unicode(email_cc)
 
@@ -962 +960 @@
             self.id = int(id[1:])
 
-        self.logger.debug("ticket_update id %s" %id)
+        self.logger.debug("\tticket id: %s" %id)
 
         ## When is the change committed
@@ -1009 +1007 @@
         elif self.parameters.email_triggers_workflow:
 
-            self.logger.debug('email triggers workflow pre trac 0.11')
+            self.logger.debug('\temail triggers workflow pre trac 0.11')
 
             if tkt['status'] in ['closed']:
@@ -1016 +1014 @@
 
         else:
-            self.logger.debug('email triggers workflow disabled')
+            self.logger.debug('\temail triggers workflow disabled')
 
         ## Must we update some ticket fields properties via subject line
@@ -1023 +1021 @@
             self.update_ticket_fields(tkt, update_fields)
 
+
         message_parts = self.get_message_parts(m)
         message_parts = self.unique_attachment_names(message_parts)
 
-        ## Must we update some ticket fields properties via body_text
+        ## Must we update some ticket fields properties via inline comments
+        # in body_text
         #
         if self.properties:
                 self.update_ticket_fields(tkt, self.properties)
+
+        ## Must we update the CC ticket field
+        #
+        self.set_cc_fields(tkt, m, update=True)
 
         if self.parameters.email_header:
@@ -1048 +1052 @@
                     body_text = '%s\\%s' %(error_with_attachments, body_text)
 
-                self.logger.debug('tkt.save_changes(%s, %d)' %(self.author, cnum))
+                self.logger.debug('\ttkt.save_changes(%s, %d)' %(self.author, cnum))
                 tkt.save_changes(self.author, body_text, when, None, str(cnum))
             
@@ -1192 +1196 @@
         tkt = Ticket(self.env)
 
-        self.set_reply_fields(tkt, msg)
+        ## self.author can be email address of an username
+        #
+        tkt['reporter'] = self.author
+
+        self.set_cc_fields(tkt, msg)
 
         self.set_ticket_fields(tkt)