Commit 5a227e99 authored by Serge S. Koval's avatar Serge S. Koval

Merge pull request #603 from pawl/patch-6

Fix bootstrap3 datepicker filter parsing issues
parents 934954d9 f11e4b55
......@@ -93,6 +93,9 @@ var AdminFilters = function(element, filtersElement, filterGroups) {
if (filter.type) {
$field.attr('data-role', filter.type);
if (filter.type == "datepicker") {
$field.attr('data-date-format', "YYYY-MM-DD");
}
faForm.applyStyle($field, filter.type);
}
}
......
......@@ -46,7 +46,7 @@
{%- endfor %}
</select>
{%- else -%}
<input name="flt{{n}}_{{ filter_arg }}" type="text" value="{{ value or '' }}" class="filter-val form-control"{% if filter.data_type %} data-role="{{ filter.data_type }}"{% endif %}></input>
<input name="flt{{n}}_{{ filter_arg }}" type="text" value="{{ value or '' }}" class="filter-val form-control"{% if filter.data_type %} data-role="{{ filter.data_type }}"{% endif %} {% if filter.data_type == "datepicker" %}data-date-format="YYYY-MM-DD"{% endif %}></input>
{%- endif -%}
</td>
</tr>
......
......@@ -144,8 +144,8 @@
{% block tail %}
{{ super() }}
{{ lib.form_js() }}
<script src="{{ admin_static.url(filename='admin/js/filters.js') }}"></script>
{{ lib.form_js() }}
{{ actionlib.script(_gettext('Please select at least one model.'),
actions,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment