From 0798102ba56eb69156a6dd7b9e1fb359b9357627 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Wed, 22 Jul 2020 19:53:35 -0500 Subject: [PATCH] Tweak "coalesce" logic for merging field data --- tailbone/views/master.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tailbone/views/master.py b/tailbone/views/master.py index 163fe91e..daac610b 100644 --- a/tailbone/views/master.py +++ b/tailbone/views/master.py @@ -2128,7 +2128,9 @@ class MasterView(View): def get_merge_resulting_data(self, remove, keep): result = dict(keep) 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] for field in self.get_merge_additive_fields(): if isinstance(keep[field], (list, tuple)):