Fix date select range filter format error.

sshwsfc · Jul 7, 2016 · 5018e33 · 5018e33
1 parent 4e6a259
commit 5018e33
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git 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
@@ -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()){