diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-04-06 16:29:32 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-04-06 16:29:32 +0200 |
| commit | 192f79a86561f276ac270992ace46932a63504a6 (patch) | |
| tree | 94ef700e01126eb623973e51a22c334615a940e8 | |
| parent | 67a6383c6f50f768e62070a68d01b4589f516cab (diff) | |
| download | Ishtar-192f79a86561f276ac270992ace46932a63504a6.tar.bz2 Ishtar-192f79a86561f276ac270992ace46932a63504a6.zip | |
Allow old operations. Seventeenth century here we are! (refs #3588)
| -rw-r--r-- | archaeological_files/forms.py | 2 | ||||
| -rw-r--r-- | archaeological_files_pdl/forms.py | 4 | ||||
| -rw-r--r-- | archaeological_finds/forms_treatments.py | 4 | ||||
| -rw-r--r-- | archaeological_operations/forms.py | 4 | ||||
| -rw-r--r-- | archaeological_operations/utils.py | 4 |
5 files changed, 9 insertions, 9 deletions
diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py index 99fe6e0db..d8738f511 100644 --- a/archaeological_files/forms.py +++ b/archaeological_files/forms.py @@ -209,7 +209,7 @@ class FileFormGeneral(ManageOldType, forms.Form): validators=[valid_id(Person)]) year = forms.IntegerField(label=_("Year"), initial=lambda: datetime.datetime.now().year, - validators=[validators.MinValueValidator(1900), + validators=[validators.MinValueValidator(1600), validators.MaxValueValidator(2100)]) numeric_reference = forms.IntegerField( label=_("Numeric reference"), widget=forms.HiddenInput, required=False) diff --git a/archaeological_files_pdl/forms.py b/archaeological_files_pdl/forms.py index 8bb1f9156..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) @@ -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) diff --git a/archaeological_finds/forms_treatments.py b/archaeological_finds/forms_treatments.py index 3c6668c9d..b3ad8b115 100644 --- a/archaeological_finds/forms_treatments.py +++ b/archaeological_finds/forms_treatments.py @@ -95,7 +95,7 @@ class BaseTreatmentForm(ManageOldType, forms.Form): label=_(u"Other ref."), max_length=200, required=False) year = forms.IntegerField(label=_("Year"), initial=lambda: datetime.datetime.now().year, - validators=[validators.MinValueValidator(1900), + validators=[validators.MinValueValidator(1600), validators.MaxValueValidator(2100)]) treatment_type = forms.MultipleChoiceField( label=_(u"Treatment type"), choices=[], @@ -405,7 +405,7 @@ class TreatmentFileForm(ManageOldType, forms.Form): max_length=1000, required=False) year = forms.IntegerField(label=_("Year"), initial=lambda: datetime.datetime.now().year, - validators=[validators.MinValueValidator(1900), + validators=[validators.MinValueValidator(1600), validators.MaxValueValidator(2100)]) internal_reference = forms.CharField( label=_(u"Internal ref."), max_length=60, required=False) diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py index 4796ef68c..86bea4ed5 100644 --- a/archaeological_operations/forms.py +++ b/archaeological_operations/forms.py @@ -72,7 +72,7 @@ class ParcelForm(forms.Form): town = forms.ChoiceField(label=_("Town"), choices=(), required=False, validators=[valid_id(models.Town)]) year = forms.IntegerField(label=_("Year"), required=False, - validators=[validators.MinValueValidator(1900), + validators=[validators.MinValueValidator(1600), validators.MaxValueValidator(2100)]) section = forms.CharField(label=_(u"Section"), required=False, validators=[validators.MaxLengthValidator(4)]) @@ -782,7 +782,7 @@ class OperationFormGeneral(ManageOldType, forms.Form): choices=[]) year = forms.IntegerField(label=_(u"Year"), initial=lambda: datetime.datetime.now().year, - validators=[validators.MinValueValidator(1900), + validators=[validators.MinValueValidator(1600), validators.MaxValueValidator(2100)]) old_code = forms.CharField( label=_(u"Old code"), required=False, diff --git a/archaeological_operations/utils.py b/archaeological_operations/utils.py index a84ff44ae..40ca71c05 100644 --- a/archaeological_operations/utils.py +++ b/archaeological_operations/utils.py @@ -254,9 +254,9 @@ def parse_year(value): value = parse_string(value) try: yr = int(value) - except: + except ValueError: return None - if yr < 1900 or yr > 2100: + if yr < 1600 or yr > 2100: return None return yr |