Skip to content

Commit

Permalink
fix
Browse files Browse the repository at this point in the history
  • Loading branch information
wuyu committed Dec 18, 2016
1 parent 97c03b6 commit 3018cb8
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions xadmin/views/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,8 +117,8 @@ def default(self, o):
return o.strftime('%Y-%m-%d')
elif isinstance(o, decimal.Decimal):
return str(o)
elif isinstance(obj, Promise):
return force_text(obj)
elif isinstance(o, Promise):
return force_text(o)
else:
try:
return super(JSONEncoder, self).default(o)
Expand Down

0 comments on commit 3018cb8

Please sign in to comment.