summaryrefslogtreecommitdiff
path: root/archaeological_operations/forms.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2017-07-30 23:15:14 +0200
committerÉtienne Loks <etienne.loks@iggdrasil.net>2017-07-30 23:15:14 +0200
commitcd35f5584355d93211d61480fd1219b302b0b177 (patch)
tree4cdecaca47fd4281b8ecf99b345682c30a8e26a2 /archaeological_operations/forms.py
parentd4f9e3adaaff86fe581b4a7a5ef93890bee40cf8 (diff)
parentb2e1c602627102d2c63616d98305941c773b24fa (diff)
downloadIshtar-cd35f5584355d93211d61480fd1219b302b0b177.tar.bz2
Ishtar-cd35f5584355d93211d61480fd1219b302b0b177.zip
Merge branch 'master' into develop
Diffstat (limited to 'archaeological_operations/forms.py')
-rw-r--r--archaeological_operations/forms.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/archaeological_operations/forms.py b/archaeological_operations/forms.py
index 4a7d56024..24b0a70be 100644
--- a/archaeological_operations/forms.py
+++ b/archaeological_operations/forms.py
@@ -62,7 +62,7 @@ class ParcelField(forms.MultiValueField):
self.widget = ParcelWidget()
return super(ParcelField, self).__init__(*args, **kwargs)
- def compress(data_list):
+ def compress(self, data_list):
return u"-".join(data_list)
@@ -73,7 +73,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,