From 3b4d4b6eb7aaed4a8d2861310cd39bbf479c6718 Mon Sep 17 00:00:00 2001 From: Valérie-Emma Leroux Date: Tue, 10 Feb 2015 17:10:03 +0100 Subject: Fix SRA_AGENT and HEAD_SCIENTIST on archaeological_files/forms.py (create when not available) --- archaeological_files/forms.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'archaeological_files/forms.py') diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py index de4539d14..ac3c9fe83 100644 --- a/archaeological_files/forms.py +++ b/archaeological_files/forms.py @@ -42,7 +42,7 @@ from ishtar_common.forms import FinalForm, FormSet, ClosingDateFormSelection, \ from ishtar_common.forms_common import get_town_field, get_person_field from archaeological_operations.forms import AdministrativeActOpeForm, \ AdministrativeActOpeFormSelection, FinalAdministrativeActDeleteForm, \ - ParcelField, SLICING, SRA_AGENT + ParcelField, SLICING, HEAD_SCIENTIST, SRA_AGENT from ishtar_common import widgets GENERAL_CONTRACTOR, created = PersonType.objects.get_or_create( @@ -181,8 +181,8 @@ class FileFormGeneral(forms.Form): 'file_type':models.FileType} in_charge = forms.IntegerField(label=_("Person in charge"), widget=widgets.JQueryAutoComplete(reverse_lazy('autocomplete-person', - args=[PersonType.objects.get(txt_idx='sra_agent').pk]), - limit={'person_types':[PersonType.objects.get(txt_idx='sra_agent').pk]}, + args=[SRA_AGENT.pk]), + limit={'person_types':[SRA_AGENT.pk]}, associated_model=Person, new=True), validators=[valid_id(Person)]) year = forms.IntegerField(label=_("Year"), @@ -290,11 +290,11 @@ class FileFormResearch(forms.Form): scientist = forms.IntegerField( widget=widgets.JQueryAutoComplete(reverse_lazy('autocomplete-person', args=["_".join( - [unicode(PersonType.objects.get(txt_idx='head_scientist').pk), - unicode(PersonType.objects.get(txt_idx='sra_agent').pk)])]), + [unicode(HEAD_SCIENTIST.pk), + unicode(SRA_AGENT.pk)])]), limit={'person_types': - [unicode(PersonType.objects.get(txt_idx='head_scientist').pk), - unicode(PersonType.objects.get(txt_idx='sra_agent').pk)]}, + [unicode(HEAD_SCIENTIST.pk), + unicode(SRA_AGENT.pk)]}, associated_model=Person, new=True), label=_(u"Scientist in charge")) requested_operation_type = forms.ChoiceField( label=_(u"Requested operation type"), @@ -383,7 +383,7 @@ class AdministrativeActFileSelect(TableSelect): label=_(u"In charge"), widget=widgets.JQueryAutoComplete( reverse_lazy('autocomplete-person', - args=[PersonType.objects.get(txt_idx='sra_agent').pk]), + args=[SRA_AGENT.pk]), associated_model=Person), validators=[valid_id(Person)]) associated_file__permit_reference = forms.CharField(max_length=200, -- cgit v1.2.3