Changeset 320

Timestamp:

02/22/10 15:31:24 (14 years ago)

Author:

bas

Message:

email2trac.py.in:

• applied patch #180 and closes #180

Location:

trunk

Files:

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

trunk/debian/changelog

@@ -25 +25 @@
     Reported by: oland dot wells add gmail.com
     Patches    : Bas van der Vlies
-   
+
+  * Show errors when we can not include attachments in the ticket, see #165
+    Requested by: hju add jochenkuhl dot de and  dereks add cool-st dot com
+    Fixed by: Bas van der Vlies
+
+  * Added a new option 'email_triggers_workflow'. When a ticket is closed and 
+    an update is received via email. The ticket will be reopened or triggers 
+    a ticket workflow. This action can be skipped if we set the 
+    email_triggers_workflow option to 0. The default value is 1, closes #180
+    Author: zac add sprackettd dot com
+    Applied by: Bas van der Vlies
+
+    
+
  -- Bas van der Vlies <basv@sara.nl>  Wed, 27 Jan 2010 16:17:41 +0100
 

trunk/email2trac.py.in

@@ -268 +268 @@
                         self.IGNORE_TRAC_USER_SETTINGS = 0
 
+                if parameters.has_key('email_triggers_workflow'):
+                        self.EMAIL_TRIGGERS_WORKFLOW = int(parameters['email_triggers_workflow'])
+                else:
+                        self.EMAIL_TRIGGERS_WORKFLOW = 1
+
                 if parameters.has_key('subject_field_separator'):
                         self.SUBJECT_FIELD_SEPARATOR = parameters['subject_field_separator'].strip()
@@ -714 +719 @@
                 # We must use the ticket workflow framework
                 #
-                if tkt['status'] in ['closed']:
+                if tkt['status'] in ['closed'] and self.EMAIL_TRIGGERS_WORKFLOW:
 
                         #print controller.actions['reopen']