From 0fb6a394915591ac828c364bffe40e01419e4c5e Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Mon, 17 Mar 2025 19:40:24 +0100 Subject: ✨ administrative act: intented to is now many (refs #6210) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- archaeological_files/forms.py | 10 +++++----- archaeological_files/tests.py | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) (limited to 'archaeological_files') diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py index 6b150a9d5..a61b500df 100644 --- a/archaeological_files/forms.py +++ b/archaeological_files/forms.py @@ -1117,10 +1117,10 @@ class AdministrativeActFileModifySelect(TableSelect): super(AdministrativeActFileModifySelect, self).__init__(*args, **kwargs) if "act_type" in self.fields: self.fields["act_type"].choices = ActType.get_types( - dct={"intented_to": "F"} + dct={"intented_to_file": True} ) self.fields["act_type"].help_text = ActType.get_help( - dct={"intented_to": "F"} + dct={"intented_to_file": True} ) k = "operation__towns__numero_insee__startswith" if settings.ISHTAR_DPTS and k in self.fields: @@ -1215,10 +1215,10 @@ class AdministrativeActFileSelect(TableSelect): super(AdministrativeActFileSelect, self).__init__(*args, **kwargs) if "act_type" in self.fields: self.fields["act_type"].choices = ActType.get_types( - dct={"intented_to": "F"} + dct={"intented_to_file": True} ) self.fields["act_type"].help_text = ActType.get_help( - dct={"intented_to": "F"} + dct={"intented_to_file": True} ) k = "associated_file__towns__numero_insee__startswith" if k in self.fields and settings.ISHTAR_DPTS: @@ -1261,7 +1261,7 @@ class AdministrativeActFileForm(AdministrativeActForm): act_type = forms.ChoiceField(label=_("Act type"), choices=[]) TYPES = [ - FieldType("act_type", ActType, extra_args={"dct": {"intented_to": "F"}}), + FieldType("act_type", ActType, extra_args={"dct": {"intented_to_file": True}}), ] diff --git a/archaeological_files/tests.py b/archaeological_files/tests.py index 271686de3..8e99f59b8 100644 --- a/archaeological_files/tests.py +++ b/archaeological_files/tests.py @@ -52,7 +52,7 @@ from archaeological_operations.tests import OperationInitTest, FileInit """ def create_administrativact(user, fle): act_type, created = ActType.objects.get_or_create( - txt_idx="act_type_F", intented_to="F" + txt_idx="act_type_F", intented_to_file=True ) dct = { "history_modifier": user, @@ -1110,7 +1110,7 @@ class FileAdminActWizardCreationTest(WizardTest, OperationInitTest, TestCase): ) data = self.form_datas[0].form_datas data["selec"]["pk"] = self.file.pk - act = ActType.objects.filter(intented_to="F").all()[0].pk + act = ActType.objects.filter(intented_to_file=True).all()[0].pk data["administrativeact"]["act_type"] = act self.number = AdministrativeAct.objects.count() super().pre_wizard() -- cgit v1.2.3