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

Fallback to None when getting values for merge preview

Browse source
This commit is contained in:
Lance Edgar 2023-09-07 20:57:33 -05:00
parent f732e04f49
commit f717bc47e5
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tailbone/views/master.py
View file

@ -2141,7 +2141,7 @@ class MasterView(View):
if self.merge_handler: if self.merge_handler:
return self.merge_handler.get_merge_preview_data(obj) 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()]) for f in self.get_merge_fields()])
def get_merge_resulting_data(self, remove, keep): def get_merge_resulting_data(self, remove, keep):