summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-07-27 12:12:30 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-07-27 12:12:30 +0200
commitee5a59601cbd02d43d9c95a51b435688ee298735 (patch)
tree107d1961156821f7159e17fb8dbcc9ffc3385cfd
parent97582674f8d68cf0c3fb7321f1cfff437eb4ea1b (diff)
downloadIshtar-ee5a59601cbd02d43d9c95a51b435688ee298735.tar.bz2
Ishtar-ee5a59601cbd02d43d9c95a51b435688ee298735.zip
Year limit is now 1000
-rw-r--r--archaeological_files/forms.py2
-rw-r--r--archaeological_files_pdl/forms.py4
-rw-r--r--archaeological_finds/forms_treatments.py4
-rw-r--r--archaeological_operations/forms.py4
-rw-r--r--archaeological_operations/utils.py2
5 files changed, 8 insertions, 8 deletions
diff --git a/archaeological_files/forms.py b/archaeological_files/forms.py
index d8738f511..afb62ae4f 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(1600),
+ validators=[validators.MinValueValidator(1000),
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 73f1d789c..e5fbb4a96 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(1600),
+ validators=[validators.MinValueValidator(1000),
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(1600),
+ validators=[validators.MinValueValidator(1000),
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 83fb11028..55e223b5d 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(1600),
+ validators=[validators.MinValueValidator(1000),
validators.MaxValueValidator(2100)])
treatment_type = forms.MultipleChoiceField(
label=_(u"Treatment type"), choices=[],
@@ -450,7 +450,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(1600),
+ validators=[validators.MinValueValidator(1000),
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 3c974991f..e3e287d24 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(1600),
+ validators=[validators.MinValueValidator(1000),
validators.MaxValueValidator(2100)])
section = forms.CharField(label=_(u"Section"), required=False,
validators=[validators.MaxLengthValidator(4)])
@@ -784,7 +784,7 @@ class OperationFormGeneral(ManageOldType, forms.Form):
choices=[])
year = forms.IntegerField(label=_(u"Year"),
initial=lambda: datetime.datetime.now().year,
- validators=[validators.MinValueValidator(1600),
+ validators=[validators.MinValueValidator(1000),
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 40ca71c05..8afbb3be8 100644
--- a/archaeological_operations/utils.py
+++ b/archaeological_operations/utils.py
@@ -256,7 +256,7 @@ def parse_year(value):
yr = int(value)
except ValueError:
return None
- if yr < 1600 or yr > 2100:
+ if yr < 1000 or yr > 2100:
return None
return yr