unifield-wm

Merge lp:~fabien-morin/unifield-wm/deleted-object-request into lp:unifield-wm

  1. deleted-object-request
  2. Merge into trunk
Proposed by Fabien MORIN
Status: Merged
Merged at revision: 2783
Proposed branch: lp:~fabien-morin/unifield-wm/deleted-object-request
Merge into: lp:unifield-wm
Diff against target: 71 lines (+12/-3)
2 files modified
msf_profile/deleted_object.py (+9/-3)
msf_profile/view/deleted_object_view.xml (+3/-0)
To merge this branch: bzr merge lp:~fabien-morin/unifield-wm/deleted-object-request
Reviewer Review Type Date Requested Status
jftempo Pending
Review via email: mp+284311@code.launchpad.net

Description of the change

[IMP] improve deleted_object to display if the deletion has been done by a synchronization or not. It is tested on RB http://fm-deleted-object-request.dsp.uf3.unifield.org:32425/

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'msf_profile/deleted_object.py'
2--- msf_profile/deleted_object.py 2015-11-27 14:19:51 +0000
3+++ msf_profile/deleted_object.py 2016-01-28 16:33:26 +0000
4@@ -41,6 +41,8 @@
5 'deletion_date': fields.datetime('Deletion Date', read_only=True),
6 'user_id': fields.many2one('res.users', 'User who delete',
7 read_only=True),
8+ 'deleted_in_sync': fields.boolean(string='Deleted by sync',
9+ help='This object has been deleted during a synchronization'),
10 }
11
12 deleted_object()
13@@ -72,6 +74,8 @@
14 def unlink(self, original_unlink, cr, uid, ids, context=None):
15 """Create a delete_object in case the current object is not blacklisted
16 to keep track of deleted objects"""
17+ if context is None:
18+ context = {}
19 res = original_unlink(self, cr, uid, ids, context=context)
20 if not res:
21 return res
22@@ -94,16 +98,18 @@
23 # sync client not installed
24 return res
25 obj_sd_ref = model_obj.get_sd_ref(cr, uid, ids)
26+ is_sync_context = context.get('sync_update_execution', False)
27+ deleted_obj_module = self.pool.get('deleted.object')
28 for sub_ids in cr.split_for_in_conditions(ids):
29 # keep a track of deleted object if there are not blacklisted
30- # by creating a delete_object
31+ # by creating a deleted.object
32 for obj_id in sub_ids:
33 vals = {'model': self._name,
34 'deleted_obj_id': obj_id,
35 'deleted_obj_sd_ref': obj_sd_ref[obj_id],
36 'deletion_date': deletion_date,
37- 'user_id': uid,}
38- deleted_obj_module = self.pool.get('deleted.object')
39+ 'user_id': uid,
40+ 'deleted_in_sync': is_sync_context,}
41 del_obj = deleted_obj_module.create(cr, uid, vals)
42 return res
43
44
45=== modified file 'msf_profile/view/deleted_object_view.xml'
46--- msf_profile/view/deleted_object_view.xml 2015-12-04 08:32:59 +0000
47+++ msf_profile/view/deleted_object_view.xml 2016-01-28 16:33:26 +0000
48@@ -12,6 +12,7 @@
49 <field name="deleted_obj_sd_ref" />
50 <field name="deletion_date" />
51 <field name="user_id" />
52+ <field name="deleted_in_sync" />
53 </tree>
54 </field>
55 </record>
56@@ -26,6 +27,7 @@
57 <field name="deleted_obj_sd_ref" />
58 <field name="deletion_date" />
59 <field name="user_id" />
60+ <field name="deleted_in_sync" />
61 </form>
62 </field>
63 </record>
64@@ -40,6 +42,7 @@
65 <field name="deleted_obj_sd_ref" />
66 <field name="deletion_date"/>
67 <field name="user_id"/>
68+ <field name="deleted_in_sync" />
69 </search>
70 </field>
71 </record>

Subscribers

People subscribed via source and target branches