summaryrefslogtreecommitdiff
path: root/ishtar_common
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2026-06-18 18:26:23 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2026-06-18 18:26:23 +0200
commit447e92a636cf4f2bb29bcc7af2892d6914e3c24c (patch)
tree0f703ad09dc9495d8ec1e31648b6ea2ee3ab619a /ishtar_common
parente66c54ce24298f61c0973fc7ca00385b3dbeee20 (diff)
downloadIshtar-447e92a636cf4f2bb29bcc7af2892d6914e3c24c.tar.bz2
Ishtar-447e92a636cf4f2bb29bcc7af2892d6914e3c24c.zip
🐛 Fix merge actions (refs #6772)
Diffstat (limited to 'ishtar_common')
-rw-r--r--ishtar_common/forms_common.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py
index 3243214b5..34ad58993 100644
--- a/ishtar_common/forms_common.py
+++ b/ishtar_common/forms_common.py
@@ -2025,14 +2025,14 @@ class MergeForm(forms.ModelForm):
callback("merge_person", request, "", queryset)
if self.cleaned_data.get("a_is_duplicate_b"):
to_item.merge(from_item)
+ to_item.save()
elif self.cleaned_data.get("b_is_duplicate_a"):
from_item.merge(to_item)
+ from_item.save()
elif self.cleaned_data.get("not_duplicate"):
from_item.merge_exclusion.add(to_item)
else:
return
- to_item.save()
- from_item.save()
try:
self.instance.__class__.objects.get(
**{self.TO_KEY: from_item, self.FROM_KEY: to_item}