Changeset 0798102 in tailbone


Ignore:
Timestamp:
07/22/2020 07:53:35 PM (3 years ago)
Author:
Lance Edgar <lance@…>
Branches:
master
Children:
d196044
Parents:
4c3112b
Message:

Tweak "coalesce" logic for merging field data

File:
1 edited

Legend:

Unmodified
Added
Removed
  • tailbone/views/master.py

    r4c3112b r0798102  
    21292129        result = dict(keep)
    21302130        for field in self.get_merge_coalesce_fields():
    2131             if remove[field] and not keep[field]:
     2131            if remove[field] is not None and keep[field] is None:
     2132                result[field] = remove[field]
     2133            elif remove[field] and not keep[field]:
    21322134                result[field] = remove[field]
    21332135        for field in self.get_merge_additive_fields():
Note: See TracChangeset for help on using the changeset viewer.