diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-10 00:26:07 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-01-10 00:26:07 +0100 |
| commit | c0f14049777002bf0849f04dabc99a6bc66de295 (patch) | |
| tree | 777c2f1bcfc1cde0056a64b04d0ee322948ade56 /archaeological_files_pdl/forms.py | |
| parent | 229a5559e9933ea76020963ca3778906d39279d4 (diff) | |
| parent | 1191cb323ca087ea05d5f58acb555b8e2d266801 (diff) | |
| download | Ishtar-c0f14049777002bf0849f04dabc99a6bc66de295.tar.bz2 Ishtar-c0f14049777002bf0849f04dabc99a6bc66de295.zip | |
Merge branch 'master' into v0.9
Conflicts:
archaeological_files/migrations/0014_auto__add_field_file_requested_operation_type__add_field_file_organiza.py
Diffstat (limited to 'archaeological_files_pdl/forms.py')
| -rw-r--r-- | archaeological_files_pdl/forms.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/archaeological_files_pdl/forms.py b/archaeological_files_pdl/forms.py index cf241aa18..4890eb5d6 100644 --- a/archaeological_files_pdl/forms.py +++ b/archaeological_files_pdl/forms.py @@ -116,6 +116,8 @@ class FileFormResearchAddress(forms.Form): form_label = _(u"Address") base_models = ['town', 'department'] associated_models = {'town': Town, 'department': Department} + name = forms.CharField(label=_(u"Project name"), required=False, + max_length=100) town = widgets.MultipleAutocompleteField( model=Town, label=_("Towns"), required=False) department = widgets.MultipleAutocompleteField( @@ -343,7 +345,7 @@ class FileFormGeneralContractor(PersonOrgaForm): class FileFormPlanningService(forms.Form): - form_label = _(u"Town planning service") + form_label = _(u"Planning service") associated_models = {'responsible_town_planning_service': models.Person, 'planning_service': models.Organization} |