From 02cc8e583d05e738a5975490a2639c72ece05d80 Mon Sep 17 00:00:00 2001 From: Marco Vidal Garcia Date: Thu, 14 Sep 2017 16:23:04 +0200 Subject: [PATCH] Replace DateField with IndicoDateField --- search/indico_search/forms.py | 6 +++--- search/indico_search/templates/results.html | 2 -- search/setup.py | 2 +- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/search/indico_search/forms.py b/search/indico_search/forms.py index 79a3f48..f86414a 100644 --- a/search/indico_search/forms.py +++ b/search/indico_search/forms.py @@ -17,11 +17,11 @@ from __future__ import unicode_literals from flask import request -from wtforms.ext.dateutil.fields import DateField from wtforms.fields.core import StringField, SelectField from wtforms.validators import Optional from indico.web.forms.base import IndicoForm +from indico.web.forms.fields import IndicoDateField from indico_search import _ @@ -37,8 +37,8 @@ FIELD_CHOICES = [('', _('Anywhere')), class SearchForm(IndicoForm): phrase = StringField(_('Phrase')) field = SelectField(_('Search in'), choices=FIELD_CHOICES, default='') - start_date = DateField('Start Date', [Optional()], parse_kwargs={'dayfirst': True}) - end_date = DateField('End Date', [Optional()], parse_kwargs={'dayfirst': True}) + start_date = IndicoDateField('Start Date', [Optional()]) + end_date = IndicoDateField('End Date', [Optional()]) def is_submitted(self): return 'search-phrase' in request.args diff --git a/search/indico_search/templates/results.html b/search/indico_search/templates/results.html index 1c5996a..09cca27 100644 --- a/search/indico_search/templates/results.html +++ b/search/indico_search/templates/results.html @@ -82,8 +82,6 @@ var text = container.is(':hidden') ? $this.data('msgShow') : $this.data('msgHide'); $('#toggle-advanced-options').text(text); }); - - $('#search-start_date, #search-end_date').datepicker(); {% block scripts %}{% endblock %} diff --git a/search/setup.py b/search/setup.py index ab22f6d..d653fe0 100644 --- a/search/setup.py +++ b/search/setup.py @@ -21,7 +21,7 @@ from setuptools import setup, find_packages setup( name='indico_search', - version='0.2', + version='0.2.1', url='https://github.com/indico/indico-plugins', license='https://www.gnu.org/licenses/gpl-3.0.txt', author='Indico Team',