Commit f022e70a authored by boomard's avatar boomard

changed bootstrap3 datetime filters to be compatible in same way as issue #603

parent dfe09ce5
...@@ -96,6 +96,9 @@ var AdminFilters = function(element, filtersElement, filterGroups) { ...@@ -96,6 +96,9 @@ var AdminFilters = function(element, filtersElement, filterGroups) {
if (filter.type == "datepicker") { if (filter.type == "datepicker") {
$field.attr('data-date-format', "YYYY-MM-DD"); $field.attr('data-date-format', "YYYY-MM-DD");
} }
else if (filter.type == "datetimepicker") {
$field.attr('data-date-format', "YYYY-MM-DD hh:mm:ss");
}
faForm.applyStyle($field, filter.type); faForm.applyStyle($field, filter.type);
} }
} }
......
...@@ -116,7 +116,7 @@ ...@@ -116,7 +116,7 @@
return true; return true;
case 'datetimepicker': case 'datetimepicker':
$el.datetimepicker({ $el.datetimepicker({
format: 'YYYY-MM-DD hh:mm:ss' //format: 'YYYY-MM-DD hh:mm:ss'
}); });
return true; return true;
case 'timepicker': case 'timepicker':
......
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
{%- endfor %} {%- endfor %}
</select> </select>
{%- else -%} {%- 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 %} {% if filter.data_type == "datepicker" %}data-date-format="YYYY-MM-DD"{% 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"{% elif filter.data_type == "datetimepicker" %}data-date-format="YYYY-MM-DD hh:mm:ss"{% endif %}></input>
{%- endif -%} {%- endif -%}
</td> </td>
</tr> </tr>
......
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