🐛 Forms: fix date validation not possible when switching to english (refs #5837)

1 files changed, 21 insertions, 31 deletions

diff --git a/archaeological_finds/forms_treatments.py b/archaeological_finds/forms_treatments.py
index a717b905d..011dc2d30 100644
--- a/archaeological_finds/forms_treatments.py
+++ b/archaeological_finds/forms_treatments.py
@@ -21,6 +21,7 @@ import datetime
 import logging
 from collections import OrderedDict
 
+from bootstrap_datepicker.widgets import DateField
 from django import forms
 from django.core import validators
 from ishtar_common.utils import ugettext_lazy as _
@@ -30,7 +31,6 @@ from archaeological_operations.forms import AdministrativeActForm, \
     AdministrativeActOpeFormSelection, AdministrativeActModifForm
 from archaeological_operations.models import ActType, AdministrativeAct
 from archaeological_warehouse.models import Warehouse, Container
-from bootstrap_datepicker.widgets import DatePicker
 from ishtar_common import widgets
 from ishtar_common.forms import reverse_lazy, TableSelect, FinalForm, \
     ManageOldType, CustomForm, FieldType, IshtarForm, \
@@ -177,10 +177,9 @@ class BaseTreatmentForm(CustomForm, ManageOldType):
         label=_("Other ref."), max_length=200, required=False)
     # external_id = forms.CharField(
     #     label=_("External ref."), max_length=200, required=False)
-    start_date = forms.DateField(label=_("Start date"), required=False,
-                                 widget=DatePicker, initial=datetime.date.today)
-    end_date = forms.DateField(label=_("Closing date"), required=False,
-                               widget=DatePicker)
+    start_date = DateField(label=_("Start date"), required=False,
+                           initial=datetime.date.today)
+    end_date = DateField(label=_("Closing date"), required=False)
     container = forms.IntegerField(
         label=_("Destination container (relevant for treatment that change "
                 "location)"),
@@ -427,8 +426,7 @@ class QAFindTreatmentForm(IshtarForm):
         label=_("Year"), initial=lambda: datetime.datetime.now().year,
         validators=[validators.MinValueValidator(1000),
                     validators.MaxValueValidator(2100)], required=False)
-    start_date = forms.DateField(label=_("Precise date"), required=False,
-                                 widget=DatePicker)
+    start_date = DateField(label=_("Precise date"), required=False)
     person = forms.IntegerField(
         label=_("Responsible"),
         widget=widgets.JQueryAutoComplete(
@@ -569,10 +567,8 @@ class AdministrativeActTreatmentSelect(TableSelect):
     act_object = forms.CharField(label=_("Object"),
                                  max_length=300)
 
-    signature_date_after = forms.DateField(
-        label=_("Signature date after"), widget=DatePicker)
-    signature_date_before = forms.DateField(
-        label=_("Signature date before"), widget=DatePicker)
+    signature_date_after = DateField(label=_("Signature date after"))
+    signature_date_before = DateField(label=_("Signature date before"))
     treatment__name = forms.CharField(
         label=_("Treatment name"), max_length=200)
     treatment__year = forms.IntegerField(label=_("Treatment year"))
@@ -664,10 +660,9 @@ class TreatmentFileSelect(DocumentItemSelect):
             associated_model=Organization),
         validators=[valid_id(Organization)])
 
-    end_date = forms.DateField(label=_("Closing date"), required=False,
-                               widget=DatePicker)
-    exhibition_start = forms.DateField(label=_("Exhibition start date"), widget=DatePicker)
-    exhibition_end = forms.DateField(label=_("Exhibition end date"), widget=DatePicker)
+    end_date = DateField(label=_("Closing date"), required=False)
+    exhibition_start = DateField(label=_("Exhibition start date"))
+    exhibition_end = DateField(label=_("Exhibition end date"))
 
     def __init__(self, *args, **kwargs):
         super(TreatmentFileSelect, self).__init__(*args, **kwargs)
@@ -748,20 +743,17 @@ class TreatmentFileForm(CustomForm, ManageOldType):
             associated_model=models.FindBasket), required=False)
     exhibition_name = forms.CharField(label=_("Exhibition name"),
                                       max_length=200, required=False)
-    exhibition_start_date = forms.DateField(
-        label=_("Exhibition start date"), required=False, widget=DatePicker)
-    exhibition_end_date = forms.DateField(
-        label=_("Exhibition end date"), required=False, widget=DatePicker)
+    exhibition_start_date = DateField(label=_("Exhibition start date"), required=False)
+    exhibition_end_date = DateField(label=_("Exhibition end date"), required=False)
     comment = forms.CharField(label=_("Comment"),
                               widget=forms.Textarea, required=False)
-    reception_date = forms.DateField(
-        label=_("Reception date"), required=False, widget=DatePicker,
-        initial=lambda: datetime.datetime.now())
-    creation_date = forms.DateField(label=_("Start date"), required=False,
-                                    widget=DatePicker,
-                                    initial=lambda: datetime.datetime.now())
-    end_date = forms.DateField(label=_("Closing date"), required=False,
-                               widget=DatePicker)
+    reception_date = DateField(
+        label=_("Reception date"), required=False,
+        initial=lambda: datetime.datetime.now()
+    )
+    creation_date = DateField(label=_("Start date"), required=False,
+                              initial=lambda: datetime.datetime.now())
+    end_date = DateField(label=_("Closing date"), required=False)
 
     TYPES = [
         FieldType('type', models.TreatmentFileType),
@@ -834,10 +826,8 @@ class AdministrativeActTreatmentFileSelect(TableSelect):
     act_object = forms.CharField(label=_("Object"),
                                  max_length=300)
 
-    signature_date_after = forms.DateField(
-        label=_("Signature date after"), widget=DatePicker)
-    signature_date_before = forms.DateField(
-        label=_("Signature date before"), widget=DatePicker)
+    signature_date_after = DateField(label=_("Signature date after"))
+    signature_date_before = DateField(label=_("Signature date before"))
 
     treatment_file__name = forms.CharField(
         label=_("Treatment request name"), max_length=200)