From 6e7bafd6f99f2200b011fc84e9795a8ce979881c Mon Sep 17 00:00:00 2001 From: Paul Schilling Date: Tue, 4 Mar 2025 16:51:39 +0100 Subject: [PATCH] [#3086] Ensure defaults for ContactFormSubject klant configs - We check in the ContactFormSubject form that both esuite_config and openklant_config are set. By default, the first instances of ESuiteKlantConfig and OpenKlant2Config are assigned. --- src/open_inwoner/openklant/admin.py | 10 ++++++++++ src/open_inwoner/openklant/tests/test_migrations.py | 4 +--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/open_inwoner/openklant/admin.py b/src/open_inwoner/openklant/admin.py index 99198e2a76..cced48fd95 100644 --- a/src/open_inwoner/openklant/admin.py +++ b/src/open_inwoner/openklant/admin.py @@ -22,6 +22,16 @@ def __init__(self, *args, **kwargs): "Must be configured if E-suite is used" ) + # set defaults for klant configs if they're missing + if not self._meta.model.esuite_config: + self._meta.model.esuite_config = ( + self._meta.model.esuite_config.field.related_model.objects.first() + ) + if not self._meta.model.openklant_config: + self._meta.model.openklant_config = ( + self._meta.model.openklant_config.field.related_model.objects.first() + ) + class Meta: model = ContactFormSubject fields = ( diff --git a/src/open_inwoner/openklant/tests/test_migrations.py b/src/open_inwoner/openklant/tests/test_migrations.py index be75563144..54f6c1eb4f 100644 --- a/src/open_inwoner/openklant/tests/test_migrations.py +++ b/src/open_inwoner/openklant/tests/test_migrations.py @@ -26,9 +26,7 @@ def test_set_default_config(self): OpenKlant2Config = self.apps.get_model("openklant", "OpenKlant2Config") for contact_form_subject in ContactFormSubject.objects.all(): - self.assertEqual( - contact_form_subject.esuite_config, self.esuite_config_1 - ) + self.assertEqual(contact_form_subject.esuite_config, self.esuite_config_1) self.assertEqual( contact_form_subject.openklant_config, self.openklant_config_1 )