fix isinstance() with datetime.datetime

FengJun1206 · Oct 29, 2016 · 2ebfa4d · 2ebfa4d
1 parent f105c30
commit 2ebfa4d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/xadmin/views/base.py b/xadmin/views/base.py
@@ -110,10 +110,10 @@ def method(self, context, nodes, *arg, **kwargs):
 
 class JSONEncoder(DjangoJSONEncoder):
     def default(self, o):
-        if isinstance(o, datetime.date):
-            return o.strftime('%Y-%m-%d')
-        elif isinstance(o, datetime.datetime):
+        if isinstance(o, datetime.datetime):
             return o.strftime('%Y-%m-%d %H:%M:%S')
+        elif isinstance(o, datetime.date):
+            return o.strftime('%Y-%m-%d')
         elif isinstance(o, decimal.Decimal):
             return str(o)
         else: