From f717bc47e56d48b210079a4ce7dce389ff4cff04 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Thu, 7 Sep 2023 20:57:33 -0500 Subject: [PATCH] Fallback to None when getting values for merge preview --- tailbone/views/master.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tailbone/views/master.py b/tailbone/views/master.py index 98408420..5027f230 100644 --- a/tailbone/views/master.py +++ b/tailbone/views/master.py @@ -2141,7 +2141,7 @@ class MasterView(View): if self.merge_handler: return self.merge_handler.get_merge_preview_data(obj) - return dict([(f, getattr(obj, f)) + return dict([(f, getattr(obj, f, None)) for f in self.get_merge_fields()]) def get_merge_resulting_data(self, remove, keep):