Changeset 543 for trunk

Timestamp:

08/09/11 13:51:58 (13 years ago)

Author:

bas

Message:

comment permission check for workflow. Is already done and some minor reformating of code

File:

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

trunk/email2trac.py.in

@@ -860 +860 @@
         #
         if self.parameters.email_triggers_workflow and (self.VERSION >= 0.11):
-
             self.logger.debug('Workflow ticket update fields: ')
-
 
             req = Mock(authname=self.author, perm=MockPerm(), args={})
@@ -869 +867 @@
             try:
                 workflow = self.parameters['workflow_%s' %tkt['status'].lower()]
+
             except KeyError: 
                 ## 
@@ -878 +877 @@
                     workflow = self.parameters.workflow
 
-
             if workflow:
 
@@ -885 +883 @@
                 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))
+                    ## Not Needed anymore, 9 Aug 2011 BvdV, we already checked the permissions
+                    #
+                    #if self.parameters.ticket_permission_system:
+                    #
+                    #
+                    #   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)
@@ -942 +942 @@
 
         if body_text.strip() or update_fields or self.properties: 
+
             if self.parameters.dry_run:
                 print 'DRY_RUN: tkt.save_changes(self.author, body_text, ticket_change_number) ', self.author, cnum
+
             else:
                 if error_with_attachments:
                     body_text = '%s\\%s' %(error_with_attachments, body_text)
+
                 self.logger.debug('tkt.save_changes(%s, %d)' %(self.author, cnum))
                 tkt.save_changes(self.author, body_text, when, None, str(cnum))
             
-
         if not spam:
             self.notify(tkt, False, when)