From 9c677ef564ecb3f5990c129975978eccd49c2b20 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Sun, 8 Sep 2024 11:43:36 +0200 Subject: 🐛 merge: do not merge import association MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise, this may result in unwanted deletion when deleting an import --- ishtar_common/model_merging.py | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'ishtar_common/model_merging.py') diff --git a/ishtar_common/model_merging.py b/ishtar_common/model_merging.py index 0e1d34c58..409161375 100644 --- a/ishtar_common/model_merging.py +++ b/ishtar_common/model_merging.py @@ -22,6 +22,9 @@ def get_models(): return models +EXCLUDED_FIELDS = ["imports"] + + @transaction.atomic def merge_model_objects( primary_object, alias_objects=None, keep_old=False, exclude_fields=None @@ -42,6 +45,8 @@ def merge_model_objects( if not exclude_fields: exclude_fields = [] + exclude_fields += EXCLUDED_FIELDS + MERGE_FIELDS = ("merge_candidate", "merge_exclusion") MERGE_STRING_FIELDS = [] @@ -141,6 +146,7 @@ def merge_model_objects( if ( alias_varname in related_many_object_names or alias_varname in MERGE_FIELDS + or alias_varname in exclude_fields ): continue -- cgit v1.2.3