From 5487417e1721ea8bae2eec996b8f8c870559cea7 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Thu, 4 Jan 2018 11:48:54 +0100 Subject: Custom form: administrativ act forms --- archaeological_files/forms.py | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'archaeological_files/forms.py') diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py index afb62ae4f..5085455d8 100644 --- a/archaeological_files/forms.py +++ b/archaeological_files/forms.py @@ -35,7 +35,7 @@ from archaeological_operations.models import ActType, AdministrativeAct, \ OperationType import models from ishtar_common.forms import FinalForm, get_now, reverse_lazy, TableSelect, \ - ManageOldType + ManageOldType, CustomForm, FieldType from ishtar_common.forms_common import get_town_field from archaeological_operations.forms import AdministrativeActOpeForm, \ AdministrativeActOpeFormSelection, \ @@ -528,15 +528,14 @@ class AdministrativeActFileModifyFormSelection( class AdministrativeActFileForm(AdministrativeActOpeForm): + form_admin_name = _(u"Archaeological files - Administrative act - General") + form_slug = "file-adminact-general" act_type = forms.ChoiceField(label=_(u"Act type"), choices=[]) - def __init__(self, *args, **kwargs): - super(AdministrativeActFileForm, self).__init__(*args, **kwargs) - self.fields['act_type'].choices = ActType.get_types( - initial=self.init_data.get('act_type'), - dct={'intented_to': 'F'}) - self.fields['act_type'].help_text = ActType.get_help( - dct={'intented_to': 'F'}) + TYPES = [ + FieldType('act_type', ActType, + extra_args={"dct": {'intented_to': 'F'}}), + ] class AdministrativeActFileModifForm(AdministrativeActModifForm, -- cgit v1.2.3