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

Tweak "coalesce" logic for merging field data

Browse source
This commit is contained in:
Lance Edgar 2020-07-22 19:53:35 -05:00
parent 4c3112b85b
commit 0798102ba5
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tailbone/views/master.py
View file

@ -2128,7 +2128,9 @@ class MasterView(View):
def get_merge_resulting_data(self, remove, keep): def get_merge_resulting_data(self, remove, keep):
result = dict(keep) result = dict(keep)
for field in self.get_merge_coalesce_fields(): for field in self.get_merge_coalesce_fields():
if remove[field] and not keep[field]: if remove[field] is not None and keep[field] is None:
result[field] = remove[field]
elif remove[field] and not keep[field]:
result[field] = remove[field] result[field] = remove[field]
for field in self.get_merge_additive_fields(): for field in self.get_merge_additive_fields():
if isinstance(keep[field], (list, tuple)): if isinstance(keep[field], (list, tuple)):