Merge pull request #621 from boombard/master

Fix for datetimepicker fields in filters for bootstrap3. Extends the fix for datepickers from issue #603.

flask_admin/static/admin/js/filters.js

@@ -96,6 +96,9 @@ var AdminFilters = function(element, filtersElement, filterGroups) {
             if (filter.type == "datepicker") {
                 $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);
         }
     }

flask_admin/templates/bootstrap3/admin/model/layout.html

@@ -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 %} {% 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 -%}
                 </td>
             </tr>