diff options
| author | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-07-10 23:27:46 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@peacefrogs.net> | 2011-07-10 23:27:46 +0200 |
| commit | 7114c0b41d7b1a65afa417a1c0e5388edcefbdb6 (patch) | |
| tree | 94775cc4b57d55f196b16a2b732e25cbd9c9cce3 | |
| parent | 7e350f0d839e3189fc700e7365d10deeb575d9da (diff) | |
| download | Ishtar-7114c0b41d7b1a65afa417a1c0e5388edcefbdb6.tar.bz2 Ishtar-7114c0b41d7b1a65afa417a1c0e5388edcefbdb6.zip | |
Allow blank year field for parcel (closes #522)
| -rw-r--r-- | ishtar/ishtar_base/forms_common.py | 6 | ||||
| -rw-r--r-- | ishtar/ishtar_base/models.py | 3 |
2 files changed, 4 insertions, 5 deletions
diff --git a/ishtar/ishtar_base/forms_common.py b/ishtar/ishtar_base/forms_common.py index 1bbdba3fc..8621a57b2 100644 --- a/ishtar/ishtar_base/forms_common.py +++ b/ishtar/ishtar_base/forms_common.py @@ -376,7 +376,6 @@ class ParcelForm(forms.Form): parcel_number = forms.CharField(label=_(u"Parcel number"), required=False, validators=[validators.MaxLengthValidator(6)]) year = forms.IntegerField(label=_("Year"), required=False, - initial=lambda:datetime.datetime.now().year, validators=[validators.MinValueValidator(1900), validators.MaxValueValidator(2100)]) def __init__(self, *args, **kwargs): @@ -401,9 +400,10 @@ class ParcelForm(forms.Form): if not self.cleaned_data or DELETION_FIELD_NAME in self.cleaned_data \ and self.cleaned_data[DELETION_FIELD_NAME]: return - for key in ('town', 'parcel_number', 'year'): + for key in ('town', 'parcel_number', 'section'): if not key in self.cleaned_data or not self.cleaned_data[key]: - raise forms.ValidationError(_(u"All fields are required")) + raise forms.ValidationError(_(u"Town section and parcel number " + u"fields are required.")) return self.cleaned_data diff --git a/ishtar/ishtar_base/models.py b/ishtar/ishtar_base/models.py index 192b3e787..56c3b551c 100644 --- a/ishtar/ishtar_base/models.py +++ b/ishtar/ishtar_base/models.py @@ -748,8 +748,7 @@ class Parcel(LightHistorizedItem): blank=True, null=True, verbose_name=_(u"File")) operation = models.ForeignKey(Operation, related_name='parcels', blank=True, null=True, verbose_name=_(u"Operation")) - year = models.IntegerField(_(u"Year"), - default=lambda:datetime.datetime.now().year) + year = models.IntegerField(_(u"Year"), blank=True, null=True) town = models.ForeignKey("Town", related_name='parcels', verbose_name=_(u"Town")) section = models.CharField(_(u"Section"), max_length=4) |