Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
wgbbiao committed Jun 7, 2017
2 parents 868590b + 7aec57c commit 3411e9c
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion xadmin/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
from django.forms import Media
from django.utils.translation import get_language
from django.contrib.admin.utils import label_for_field, help_text_for_field
from django import VERSION as version
import datetime
import decimal

Expand Down Expand Up @@ -292,7 +293,7 @@ def lookup_field(name, obj, model_admin=None):
model_admin is not None
and hasattr(model_admin, name)
and name not in ('__str__', '__unicode__')
):
):
attr = getattr(model_admin, name)
value = attr(obj)
else:
Expand Down

0 comments on commit 3411e9c

Please sign in to comment.