Changeset 538 for trunk/email2trac.py.in

Timestamp:

08/09/11 11:01:58 (12 years ago)

Author:

bas

Message:

email2trac only used the default workflow. We now use the ticket workflow that is defined in trac.ini, see #226

File:

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

trunk/email2trac.py.in

@@ -649 +649 @@
         Check if the mailer is allowed to update the ticket
         """
-        self.logger.debug('function check_permission_participants')
+        self.logger.debug('function check_permission_participants %s')
 
         if tkt['reporter'].lower() in [self.author.lower(), self.email_addr.lower()]:
@@ -689 +689 @@
             - email2trac: ....
         """
-        self.logger.debug("function check_permission")
+        self.logger.debug("function check_permission: %s" %(action))
 
         if self.parameters.ticket_permission_system in ['trac']:
@@ -863 +863 @@
             self.logger.debug('Workflow ticket update fields: ')
 
-            from trac.ticket.default_workflow import ConfigurableTicketWorkflow
-            from trac.test import Mock, MockPerm
 
             req = Mock(authname=self.author, perm=MockPerm(), args={})
+            ticket_system = TicketSystem(self.env)
+
             try:
                 workflow = self.parameters['workflow_%s' %tkt['status'].lower()]
@@ -878 +878 @@
                     workflow = self.parameters.workflow
 
-            controller = ConfigurableTicketWorkflow(self.env)
-            #print controller.actions
-            #print controller.actions.keys()
-            #print controller.get_ticket_actions(req, tkt)
-            #print controller.actions[workflow]
-            #print controller.actions[workflow]['permissions'] is a list
 
             if workflow:
 
-                if self.parameters.ticket_permission_system:
-
-                    if self.check_permission(tkt, controller.actions[workflow]['permissions'][0]):
-                        fields = controller.get_ticket_changes(req, tkt, workflow)
-                    else:
-                        fields = dict()
-                        self.logger.info('Reporter: %s has no permission to trigger workflow' %self.author)
-
-                else:
+                ## There can be several workflow implementations
+                #
+                for controller in ticket_system.action_controllers:
+
+                    if self.parameters.ticket_permission_system:
+
+                        ## Could be disabled in the future !?
+                        #
+                        try:
+                            if not self.check_permission(tkt, controller.actions[workflow]['permissions'][0]):
+                                self.logger.info('Reporter: %s has no permission to trigger workflow' %self.author)
+                                break
+                        except AttributeError, detail:
+                                self.logger.info('controller %s has no actions implementations' %(controller))
+
                     fields = controller.get_ticket_changes(req, tkt, workflow)
 
-                for key in fields.keys():
-                    self.logger.debug('\t %s : %s' %(key, fields[key]))
-                    tkt[key] = fields[key]
-
+                    for key in fields.keys():
+                        self.logger.debug('\t workflow %s %s : %s' %(controller, key, fields[key]))
+                        tkt[key] = fields[key]
+                            
             else:
 
@@ -1291 +1291 @@
         from tracfullblog.core import FullBlogCore
         from tracfullblog.model import BlogPost, BlogComment
-        from trac.test import Mock, MockPerm
 
         ## instantiate blog core
@@ -2459 +2458 @@
             from trac.perm import PermissionSystem
             from trac.ticket.web_ui import TicketModule
+            from trac.ticket.api import TicketSystem
+            from trac.test import Mock, MockPerm
 
             #
@@ -2476 +2477 @@
             from trac.perm import PermissionSystem
             from trac.ticket.web_ui import TicketModule
+            from trac.ticket.api import TicketSystem
+            from trac.test import Mock, MockPerm
 
             #