From 5018e33b1cf9a825729a7d010ad456e0c80496d1 Mon Sep 17 00:00:00 2001 From: sshwsfc Date: Thu, 7 Jul 2016 16:58:14 +0800 Subject: [PATCH] Fix date select range filter format error. --- demo_app/demo/settings.py | 4 ---- xadmin/static/xadmin/js/xadmin.plugin.filters.js | 4 ++-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/demo_app/demo/settings.py b/demo_app/demo/settings.py index b717773cb..87b76b1d3 100644 --- a/demo_app/demo/settings.py +++ b/demo_app/demo/settings.py @@ -148,10 +148,6 @@ 'app', ) -DATE_FORMAT = 'Y-m-d' -DATETIME_FORMAT = 'Y-m-d H:i' -TIME_FORMAT = 'H:i' - TEST_RUNNER = 'django.test.runner.DiscoverRunner' # A sample logging configuration. The only tangible logging diff --git a/xadmin/static/xadmin/js/xadmin.plugin.filters.js b/xadmin/static/xadmin/js/xadmin.plugin.filters.js index fe2980110..2d77cd690 100644 --- a/xadmin/static/xadmin/js/xadmin.plugin.filters.js +++ b/xadmin/static/xadmin/js/xadmin.plugin.filters.js @@ -26,8 +26,8 @@ $('.menu-date-range form').each(function(){ var el = $(this); - var start_date = el.find('.calendar.date-start').datepicker({format: $.date_local.dateJSFormat, language: 'xadmin'}); - var end_date = el.find('.calendar.date-end').datepicker({format: $.date_local.dateJSFormat, language: 'xadmin'}); + var start_date = el.find('.calendar.date-start').datepicker({format: 'yyyy-mm-dd', language: 'xadmin'}); + var end_date = el.find('.calendar.date-end').datepicker({format: 'yyyy-mm-dd', language: 'xadmin'}); var checkAvailable = function(){ if(start_date.data('datepicker').getDate().valueOf() <= end_date.data('datepicker').getDate().valueOf()){