Changeset 12168

Timestamp:

Oct 15, 2012, 10:20:29 AM (11 years ago)

Author:

osimons

Message:

XmlRpcPlugin: Trac 0.13+/1.0+ changes timestamps for ticket updates. Added compat code. Fixes #9921.

Location:

xmlrpcplugin/trunk/tracrpc

Files:

• tests/ticket.py (modified) (4 diffs)
• ticket.py (modified) (5 diffs)

xmlrpcplugin/trunk/tracrpc/tests/ticket.py

@@ -269 +269 @@
         # Update with collision check
         import datetime
-        from tracrpc.xml_rpc import from_xmlrpc_datetime, to_xmlrpc_datetime
+        from tracrpc.util import to_utimestamp
+        from tracrpc.xml_rpc import from_xmlrpc_datetime
         tid = self.admin.ticket.create('test_update_time_changed', '...', {})
         tid, created, modified, attrs = self.admin.ticket.get(tid)
@@ -276 +277 @@
         try:
             self.admin.ticket.update(tid, "comment1",
-                    {'_ts': to_xmlrpc_datetime(then)})
+                    {'_ts': str(to_utimestamp(then))})
         except Exception, e:
             self.assertTrue("Ticket has been updated since last get" in str(e))
@@ -282 +283 @@
         try:
             self.admin.ticket.update(tid, "comment1",
-                    {'_ts': to_xmlrpc_datetime(then),
+                    {'_ts': str(to_utimestamp(then)),
                      'action': 'leave'})
         except Exception, e:
@@ -289 +290 @@
 
     def test_update_time_same(self):
-        # Update with collision check
-        import datetime
-        from tracrpc.xml_rpc import from_xmlrpc_datetime, to_xmlrpc_datetime
-
         # Unrestricted old-style update (to be removed soon)
         tid = self.admin.ticket.create('test_update_time_same', '...', {})

xmlrpcplugin/trunk/tracrpc/ticket.py

@@ -25 +25 @@
 
 from tracrpc.api import IXMLRPCHandler, expose_rpc, Binary
-from tracrpc.util import StringIO, to_utimestamp
+from tracrpc.util import StringIO, to_utimestamp, from_utimestamp
 
 __all__ = ['TicketRPC']
@@ -149 +149 @@
         t = model.Ticket(self.env, id)
         req.perm(t.resource).require('TICKET_VIEW')
-        t['_ts'] = str(t.time_changed)
+        t['_ts'] = str(to_utimestamp(t.time_changed))
         return (t.id, t.time_created, t.time_changed, t.values)
 
@@ -209 +209 @@
             req.perm(t.resource).require('TICKET_MODIFY')
             time_changed = attributes.pop('_ts', None)
-            if time_changed and str(time_changed) != str(t.time_changed):
+            if time_changed and \
+                    str(time_changed) != str(to_utimestamp(t.time_changed)):
                 raise TracError("Ticket has been updated since last get().")
             for k, v in attributes.iteritems():
@@ -218 +219 @@
             tm = TicketModule(self.env)
             # TODO: Deprecate update without time_changed timestamp
-            time_changed = str(attributes.pop('_ts', t.time_changed))
+            time_changed = attributes.pop('_ts', to_utimestamp(t.time_changed))
+            try:
+                time_changed = int(time_changed)
+            except ValueError:
+                raise TracError("RPC ticket.update: Wrong '_ts' token " \
+                                "in attributes (%r)." % time_changed)
             action = attributes.get('action')
             avail_actions = ts.get_available_actions(req, t)
@@ -232 +238 @@
             req.args.update(attributes)
             req.args['comment'] = comment
-            req.args['ts'] = time_changed
+            # Collision detection: 0.11+0.12 timestamp
+            req.args['ts'] = str(from_utimestamp(time_changed))
+            # Collision detection: 0.13/1.0+ timestamp
+            req.args['view_time'] = str(time_changed)
             changes, problems = tm.get_ticket_changes(req, t, action)
             for warning in problems: