diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-04-07 12:16:37 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-04-07 12:16:37 +0200 |
| commit | 6b87dae76d931ead9838db1f66a6ff1fe1cc1dd1 (patch) | |
| tree | 0a2273d9db0499214e18a041987339eac9d20ac9 /archaeological_files_pdl | |
| parent | 75730c0ac55c935c03e58977405b4b8a2233595d (diff) | |
| parent | 3d8b8d86f01ecb9b37e24e25fd15500b8f4fb2a0 (diff) | |
| download | Ishtar-6b87dae76d931ead9838db1f66a6ff1fe1cc1dd1.tar.bz2 Ishtar-6b87dae76d931ead9838db1f66a6ff1fe1cc1dd1.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'archaeological_files_pdl')
| -rw-r--r-- | archaeological_files_pdl/forms.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/archaeological_files_pdl/forms.py b/archaeological_files_pdl/forms.py index 4890eb5d6..73f1d789c 100644 --- a/archaeological_files_pdl/forms.py +++ b/archaeological_files_pdl/forms.py @@ -40,7 +40,7 @@ class FileFormGeneral(ManageOldType, forms.Form): file_type = forms.ChoiceField(label=_("File type"), choices=[]) year = forms.IntegerField(label=_("Year"), initial=lambda: datetime.datetime.now().year, - validators=[validators.MinValueValidator(1900), + validators=[validators.MinValueValidator(1600), validators.MaxValueValidator(2100)]) creation_date = forms.DateField(label=_(u"Creation date"), initial=get_now, widget=widgets.JQueryDate) @@ -86,9 +86,9 @@ class FileFormPlanning(forms.Form): associated_models = {'town': Town, 'department': Department} name = forms.CharField(label=_(u"Planning name"), required=False, max_length=100) - town = widgets.MultipleAutocompleteField( - model=Town, label=_("Towns"), required=False) - department = widgets.MultipleAutocompleteField( + town = widgets.Select2MultipleField( + model=Town, label=_("Towns"), required=False, remote=True) + department = widgets.Select2MultipleField( model=Department, label=_("Departments"), required=False) locality = forms.CharField(label=_(u"Locality"), max_length=100, required=False) @@ -118,9 +118,9 @@ class FileFormResearchAddress(forms.Form): 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( + town = widgets.Select2MultipleField( + model=Town, label=_("Towns"), required=False, remote=True) + department = widgets.Select2MultipleField( model=Department, label=_("Departments"), required=False) locality = forms.CharField(label=_(u"Locality"), max_length=100, required=False) @@ -413,7 +413,7 @@ class FileFormInstruction(forms.Form): instruction_deadline = forms.DateField(widget=widgets.JQueryDate, required=False) year = forms.IntegerField(label=_("Year"), - validators=[validators.MinValueValidator(1900), + validators=[validators.MinValueValidator(1600), validators.MaxValueValidator(2100)]) numeric_reference = forms.IntegerField(label=_("Numeric reference"), required=False) |