diff options
author | Étienne Loks <etienne.loks@proxience.com> | 2014-12-30 17:21:04 +0100 |
---|---|---|
committer | Étienne Loks <etienne.loks@proxience.com> | 2015-05-06 15:38:32 +0200 |
commit | 15be527b85dd4060a2728f3eff7f461450a3d53e (patch) | |
tree | f144fb4bac2bc870349719472ec50b844e1619ad /archaeological_files_pdl/forms.py | |
parent | 25ec2a9794786ac83fa8ce743078305682d8298d (diff) | |
download | Ishtar-15be527b85dd4060a2728f3eff7f461450a3d53e.tar.bz2 Ishtar-15be527b85dd4060a2728f3eff7f461450a3d53e.zip |
Fix new file UI submission
Diffstat (limited to 'archaeological_files_pdl/forms.py')
-rw-r--r-- | archaeological_files_pdl/forms.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/archaeological_files_pdl/forms.py b/archaeological_files_pdl/forms.py index 295edcd36..be1754347 100644 --- a/archaeological_files_pdl/forms.py +++ b/archaeological_files_pdl/forms.py @@ -70,7 +70,7 @@ class FileFormPreventiveType(forms.Form): class FileFormPlanning(forms.Form): form_label = _(u"Planning") - associated_models = {'town':models.Town} + associated_models = {'main_town':models.Town} name = forms.CharField(label=_(u"Planning name"), required=False, max_length=100) main_town = get_advanced_town_field(required=True) @@ -159,13 +159,13 @@ class FileFormGeneralContractor(forms.Form): class FileFormPlanningService(forms.Form): form_label = _(u"Town planning service") - associated_models = {'responsible_planning_service':models.Person} + associated_models = {'responsible_town_planning_service':models.Person} reference_number = forms.IntegerField(label=_(u"File reference"), required=False) def __init__(self, *args, **kwargs): super(FileFormPlanningService, self).__init__(*args, **kwargs) - self.fields['responsible_planning_service'] = forms.IntegerField( + self.fields['responsible_town_planning_service'] = forms.IntegerField( label=_(u"Responsible town planning service"), widget=widgets.JQueryPersonOrganization( reverse_lazy('autocomplete-person', @@ -176,11 +176,12 @@ class FileFormPlanningService(forms.Form): js_template='ishtar/blocks/JQueryCorporationPerson.js', new=True), validators=[valid_id(Person)]) - self.fields.keyOrder = ['responsible_planning_service', + self.fields.keyOrder = ['responsible_town_planning_service', 'reference_number'] class FileFormInstruction(forms.Form): form_label = u"Instruction SRA" + associated_models = {'in_charge':models.Person} in_charge = forms.IntegerField(label=_("Person in charge"), widget=widgets.JQueryAutoComplete(reverse_lazy('autocomplete-person', args=[PersonType.objects.get(txt_idx='sra_agent').pk]), |