diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2014-05-12 17:02:56 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2014-05-12 17:02:56 +0200 |
| commit | fe9484b72cd2daed7cfb2bf7f9b330bd0e0b76dd (patch) | |
| tree | 592a834685dac25aad04bb0f4505ec9006e787b4 /archaeological_files | |
| parent | 9d3f78cb51f05c6f39d95b222bbd03cf19018e60 (diff) | |
| download | Ishtar-fe9484b72cd2daed7cfb2bf7f9b330bd0e0b76dd.tar.bz2 Ishtar-fe9484b72cd2daed7cfb2bf7f9b330bd0e0b76dd.zip | |
Work on registry search (refs #1680) - work on operations test
Diffstat (limited to 'archaeological_files')
| -rw-r--r-- | archaeological_files/forms.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py index 48ed874ff..0879f428e 100644 --- a/archaeological_files/forms.py +++ b/archaeological_files/forms.py @@ -45,6 +45,9 @@ from archaeological_operations.forms import AdministrativeActOpeForm, \ ParcelField from ishtar_common import widgets +GENERAL_CONTRACTOR, created = PersonType.objects.get_or_create( + txt_idx='general_contractor') + class FileSelect(TableSelect): year = forms.IntegerField(label=_("Year")) numeric_reference = forms.IntegerField(label=_("Numeric reference")) @@ -60,15 +63,14 @@ class FileSelect(TableSelect): label=_(u"General contractor"), widget=widgets.JQueryAutoComplete( reverse_lazy('autocomplete-person', - args=[PersonType.objects.get(txt_idx='general_contractor').pk]), + args=[GENERAL_CONTRACTOR.pk]), associated_model=Person), validators=[valid_id(Person)]) general_contractor__attached_to = forms.IntegerField( label=_(u"Organization of general contractor"), widget=widgets.JQueryAutoComplete( reverse_lazy('autocomplete-organization', - args=[OrganizationType.objects.get( - txt_idx='general_contractor').pk]), + args=[GENERAL_CONTRACTOR.pk]), associated_model=Organization), validators=[valid_id(Organization)]) in_charge = forms.IntegerField( @@ -165,6 +167,8 @@ class FileFormGeneralRO(FileFormGeneral): numeric_reference = forms.IntegerField(label=_(u"Numeric reference"), widget=forms.TextInput(attrs={'readonly':True})) +RESPONSIBLE_PLANNING_SERVICE, created = PersonType.objects.get_or_create( + txt_idx='responsible_planning_service') class FileFormPreventive(forms.Form): form_label = _(u"Preventive informations") associated_models = {'general_contractor':Person, @@ -181,8 +185,7 @@ class FileFormPreventive(forms.Form): label=_(u"Responsible for town planning service"), widget=widgets.JQueryAutoComplete( reverse_lazy('autocomplete-person', - args=[PersonType.objects.get( - txt_idx='responsible_planning_service').pk]), + args=[RESPONSIBLE_PLANNING_SERVICE.pk]), associated_model=Person, new=True), validators=[valid_id(Person)]) permit_type = forms.ChoiceField(label=_(u"Permit type"), required=False, @@ -298,8 +301,7 @@ class AdministrativeActFileSelect(TableSelect): label=_(u"Organization of general contractor"), widget=widgets.JQueryAutoComplete( reverse_lazy('autocomplete-organization', - args=[OrganizationType.objects.get( - txt_idx='general_contractor').pk]), + args=[GENERAL_CONTRACTOR.pk]), associated_model=Organization), validators=[valid_id(Organization)]) associated_file__numeric_reference = forms.IntegerField( |