Changeset 2654

Timestamp:

09/23/07 08:27:43 (1 year ago)

Author:

coling

Message:

Fix a bug whereby ticket changes were broken when the status was NOT changed... Should allow messages to be left on closed tickets and for integration with the trac post commit hook to close tickets via svn log message.

Files:

• worklogplugin/0.10/worklog/manager.py (modified) (2 diffs)
• worklogplugin/0.10/worklog/ticket_daemon.py (modified) (2 diffs)

worklogplugin/0.10/worklog/manager.py

@@ -72 +72 @@
-            if change['permanent']:
-                cnum += 1
-
-        tckt.save_changes(self.authname, msg, self.now, db, cnum+1)
+        ## Often the time overlaps and causes a db error,
+        ## especially when the trac integration post-commit hook is used.
+        ## NOTE TO SELF. I DON'T THINK THIS IS NECESSARY RIGHT NOW...
+        #count = 0
+        #while count < 10:
+        #    try:
+        #        tckt.save_changes(self.authname, msg, self.now, db, cnum+1)
+        #        count = 42
+        #    except Exception, e:
+        #        self.now += 1
+        #        count += 1
-        db.commit()
-        
@@ -192 +202 @@
-            db = self.env.get_db_cnx()
-            tckt = Ticket(self.env, active['ticket'], db)
+            
-            # This hideous hack is here because I don't yet know how to do variable-DP rounding in python - sorry!
-            # It's meant to round to 2 DP, so please replace it if you know how.  Many thanks, MK.

worklogplugin/0.10/worklog/ticket_daemon.py

@@ -11 +11 @@
-        """Called when a ticket is created."""
-        pass
-
-
+
-    def ticket_changed(self, ticket, comment, author, old_values):
-        """Called when a ticket is modified.
@@ -21 +20 @@
-        if self.config.getbool('worklog', 'autostop') \
-               and 'closed' == ticket['status'] \
+               and old_values.has_key('status') \
-               and 'closed' != old_values['status']:
-            mgr = WorkLogManager(self.env, self.config)