rattail/tailbone
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Add 'additive fields' concept to merge diff preview

Browse source
This commit is contained in:
Lance Edgar 2016-11-10 17:13:46 -06:00
parent 7dd19c6d87
commit fe978a9bd2
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
tailbone/views/master.py
View file

@ -413,6 +413,11 @@ class MasterView(View):
return self.merge_coalesce_fields
return []
def get_merge_additive_fields(self):
if hasattr(self, 'merge_additive_fields'):
return self.merge_additive_fields
return []
def merge(self):
"""
Preview and execute a merge of two records.
@ -463,6 +468,11 @@ class MasterView(View):
for field in self.get_merge_coalesce_fields():
if remove[field] and not keep[field]:
result[field] = remove[field]
for field in self.get_merge_additive_fields():
if isinstance(keep[field], (list, tuple)):
result[field] = sorted(set(remove[field] + keep[field]))
else:
result[field] = remove[field] + keep[field]
return result
def merge_objects(self, removing, keeping):