Merge lp:~jfb-tempo-consulting/unifield-wm/sync-bklg-56 into lp:unifield-wm/sync

[jftempo]

=== modified file 'sync_client/monitor.py'
--- sync_client/monitor.py	2015-02-18 08:04:40 +0000
+++ sync_client/monitor.py	2015-05-22 08:47:06 +0000
@@ -211,9 +211,16 @@
     def _is_syncing(self, cr, uid, ids, name, arg, context=None):
         res = dict.fromkeys(ids, "not_syncing")
         is_syncing = self.pool.get('sync.client.entity').is_syncing()
-        for monitor in self.browse(cr, uid, ids, context=context):
-            if monitor.status == 'in-progress' and is_syncing:
-                res[monitor.id] = "syncing"
+        max_id = 0
+        if is_syncing:
+            for monitor in self.browse(cr, uid, ids, context=context):
+                if monitor.status == 'in-progress' and monitor.id > max_id:
+                    max_id = monitor.id
+        if max_id:
+            if self.pool.get('sync.client.entity').aborting:
+                res[max_id] = "aborting"
+            else:
+                res[max_id] = "syncing"
 
         return res
 
@@ -240,7 +247,7 @@
         'msg_push_send' : fields.selection(status_dict.items(), string="MP Send", readonly=True),
         'status' : fields.selection(status_dict.items(), string="Status", readonly=True),
         'error' : fields.text("Messages", readonly=True),
-        'state' : fields.function(_is_syncing, method=True, type='selection', string="Is Syncing", selection=[('syncing', 'Syncing'), ('not_syncing', 'Done')]),
+        'state' : fields.function(_is_syncing, method=True, type='selection', string="Is Syncing", selection=[('syncing', 'Syncing'), ('not_syncing', 'Done'), ('aborting', 'Aborting')]),
 
         'instance_id': fields.many2one('msf.instance', 'Instance', select=1),
         'my_instance': fields.function(_get_my_instance, method=True, type='boolean', fnct_search=_search_my_instance, string="My Instance"),
 
=== modified file 'sync_client/sync_client.py'
--- sync_client/sync_client.py	2015-05-06 13:52:09 +0000
+++ sync_client/sync_client.py	2015-05-22 08:47:06 +0000
@@ -957,6 +957,7 @@
                 raise already_syncing_error
             return True
         self.sync_lock.release()
+        self.aborting = False
         return False
 
     def get_status(self, cr, uid, context=None):
@@ -964,6 +965,8 @@
             return "Not Connected"
 
         if self.is_syncing():
+            if self.aborting:
+                return "Aborting..."
             return "Syncing..."
 
         monitor = self.pool.get("sync.monitor")
@@ -976,10 +979,11 @@
 
     def interrupt_sync(self, cr, uid, context=None):
         if self.is_syncing():
-            try:
-                self._renew_sync_lock()
-            except StandardError:
-                return False
+            #try:
+            #    self._renew_sync_lock()
+            #except StandardError:
+            #    return False
+            self.aborting = True
             self.sync_cursor.close()
         return True