diff options
Diffstat (limited to 'ishtar_common/forms_common.py')
| -rw-r--r-- | ishtar_common/forms_common.py | 43 |
1 files changed, 11 insertions, 32 deletions
diff --git a/ishtar_common/forms_common.py b/ishtar_common/forms_common.py index 672acfae1..261bba4af 100644 --- a/ishtar_common/forms_common.py +++ b/ishtar_common/forms_common.py @@ -29,8 +29,8 @@ import tempfile from urllib.parse import urlparse, quote import zipfile +from bootstrap_datepicker.widgets import DateField from django import forms -from django.apps import apps from django.conf import settings from django.contrib.auth import password_validation from django.contrib.auth.models import User @@ -54,7 +54,6 @@ from django.utils.translation import ugettext_lazy as _, pgettext from . import models, models_rest from .models_imports import FORMATER_WIDGETS_DCT from . import widgets -from bootstrap_datepicker.widgets import DatePicker from ishtar_common.templatetags.link_to_window import simple_link_to_window from .forms import ( FinalForm, @@ -2157,15 +2156,9 @@ class DocumentForm(forms.ModelForm, CustomForm, ManageOldType): validators=[validators.MaxLengthValidator(100)], required=False, ) - receipt_date = forms.DateField( - label=_("Receipt date"), required=False, widget=DatePicker - ) - creation_date = forms.DateField( - label=_("Creation date"), required=False, widget=DatePicker - ) - receipt_date_in_documentation = forms.DateField( - label=_("Receipt date in documentation"), required=False, widget=DatePicker - ) + receipt_date = DateField(label=_("Receipt date"), required=False) + creation_date = DateField(label=_("Creation date"), required=False) + receipt_date_in_documentation = DateField(label=_("Receipt date in documentation"), required=False) comment = forms.CharField(label=_("Comment"), widget=forms.Textarea, required=False) description = forms.CharField( label=_("Description"), widget=forms.Textarea, required=False @@ -2566,24 +2559,12 @@ class DocumentSelect(HistorySelect): ) town = get_town_field() area = widgets.Select2SimpleField(label=_("Area")) - receipt_date__before = forms.DateField( - label=_("Receipt date before"), widget=DatePicker - ) - receipt_date__after = forms.DateField( - label=_("Receipt date after"), widget=DatePicker - ) - creation_date__before = forms.DateField( - label=_("Creation date before"), widget=DatePicker - ) - creation_date__after = forms.DateField( - label=_("Creation date after"), widget=DatePicker - ) - receipt_date_in_documentation__before = forms.DateField( - label=_("Receipt date before"), widget=DatePicker - ) - receipt_date_in_documentation__after = forms.DateField( - label=_("Receipt date after"), widget=DatePicker - ) + receipt_date__before = DateField(label=_("Receipt date before")) + receipt_date__after = DateField(label=_("Receipt date after")) + creation_date__before = DateField(label=_("Creation date before")) + creation_date__after = DateField(label=_("Creation date after")) + receipt_date_in_documentation__before = DateField(label=_("Receipt date before")) + receipt_date_in_documentation__after = DateField(label=_("Receipt date after")) TYPES = [ FieldType("source_type", models.SourceType), @@ -2665,9 +2646,7 @@ class QADocumentFormMulti(QAForm): qa_authors = widgets.ModelJQueryAutocompleteField( model=models.Author, label=_("Author"), new=True, required=False ) - qa_creation_date = forms.DateField( - label=_("Creation date"), widget=DatePicker, required=False - ) + qa_creation_date = DateField(label=_("Creation date"), required=False) qa_format_type = forms.ChoiceField(label=_("Format"), choices=[], required=False) qa_support_type = forms.ChoiceField(label=_("Medium"), choices=[], required=False) qa_scale = forms.CharField(label=_("Scale"), max_length=30, required=False) |