Merge branch 'master' of github.com:shymonk/django-datatable

shymonk · Nov 16, 2015 · 24049a0 · 24049a0
2 parents 8d3d8cd + d285ab5
commit 24049a0
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/table/utils.py b/table/utils.py
@@ -30,7 +30,10 @@ def resolve(self, context, quiet=True):
                     obj = obj[int(level)]
                 else:
                     if callable(getattr(obj, level)):
-                        obj = getattr(obj, level)()
+                        try:
+                            obj = getattr(obj, level)()
+                        except KeyError:
+                            obj = getattr(obj, level)
                     else:
                         # for model field that has choice set
                         # use get_xxx_display to access