Changeset 469

Timestamp:

08/05/10 11:50:22 (13 years ago)

Author:

bas

Message:

improved workflow patch, see #198

File:

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

trunk/email2trac.py.in

@@ -784 +784 @@
                 #  We must use the ticket workflow framework
                 #
-                if self.parameters.email_triggers_workflow :
-
-                        #print controller.actions['reopen']
-                        #
-                        # As reference  
-                        # req = Mock(href=Href('/'), abs_href=Href('http://www.example.com/'), authname='anonymous', perm=MockPerm(), args={})
-                        #
-                        #a = controller.render_ticket_action_control(req, tkt, 'reopen')
-                        #print 'controller : ', a
-                        #
-                        #b = controller.get_all_status()
-                        #print 'get all status: ', b
-                        #
-                        #b = controller.get_ticket_changes(req, tkt, 'reopen')
-                        #print 'get_ticket_changes :', b
-
-                        workflow = None
-                        if self.VERSION >= 0.11:
-
+                if self.parameters.email_triggers_workflow and (self.VERSION >= 0.11):
+
+                        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={})
+                        try:
                                 workflow = self.parameters['workflow_%s' %tkt['status']]
-
+                        except KeyError: 
                                 ## fallback for compability (Will be deprecated)
                                 #
-                                if not workflow:
-                                        if tkt['status'] in ['closed'] and self.parameters.workflow:
-                                                workflow = self.parameters.workflow
+                                if tkt['status'] in ['closed']:
+                                        workflow = self.parameters.workflow
+                                else:   
+                                        workflow = None
+
+                        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:
-                                ## Execute workflow
-                                #
-                                from trac.ticket.default_workflow import ConfigurableTicketWorkflow
-                                from trac.test import Mock, MockPerm
-
-                                req = Mock(authname='anonymous', perm=MockPerm(), args={})
-
-                                controller = ConfigurableTicketWorkflow(self.env)
-                                fields = controller.get_ticket_changes(req, tkt, workflow)
-
-                                self.logger.debug('Workflow ticket update fields: ')
+
+                                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:
+                                        fields = controller.get_ticket_changes(req, tkt, workflow)
 
                                 for key in fields.keys():
@@ -828 +826 @@
                                         tkt[key] = fields[key]
 
-                        elif tkt['status'] in ['closed']:
-                                ## default when no workflow defined or wrong version of trac
-                                #
+                ## Old pre 0.11 situation
+                # 
+                elif self.parameters.email_triggers_workflow:
+                        self.logger.debug('email triggers workflow pre trac 0.11')
+                        if tkt['status'] in ['closed']:
                                 tkt['status'] = 'reopened'
                                 tkt['resolution'] = ''
 
-                # Must we update some ticket fields properties via subjectline
+                else:
+                        self.logger.debug('email triggers workflow disabled')
+
+                ## Must we update some ticket fields properties via subjectline
                 #
                 if update_fields: