1.14.0 - get_OBJECT_display

Author: pigletto

CHANGES

@@ -1,3 +1,8 @@
+2017.02.01 - 1.14.0
+ - render_column method is now able to call get_OBJECT_display on foreign models (issue #31)
+ - potentially backward incompatible change in render_column - get_absolute_url is now called on obj that is
+   computed from dotted notation
+
 2016.10.30 - 1.13.2
  - Make POST requests work (thanks Adam Taylor)
  - Change handling of 'result' error/ok state by JSONResponseMixin (Issue #26)

django_datatables_view/base_datatable_view.py

@@ -42,29 +42,28 @@ def get_columns(self):
         return self.columns
 
     def render_column(self, row, column):
-        """ Renders a column on a row
+        """ Renders a column on a row. column can be given in a module notation eg. document.invoice.type
         """
-        if hasattr(row, 'get_%s_display' % column):
-            # It's a choice field
-            text = getattr(row, 'get_%s_display' % column)()
+        # try to find rightmost object
+        obj = row
+        parts = column.split('.')
+        for part in parts[:-1]:
+            if obj is None:
+                break
+            obj = getattr(obj, part)
+
+        # try using get_OBJECT_display for choice fields
+        if hasattr(obj, 'get_%s_display' % parts[-1]):
+            value = getattr(obj, 'get_%s_display' % parts[-1])()
         else:
-            try:
-                text = getattr(row, column)
-            except AttributeError:
-                obj = row
-                for part in column.split('.'):
-                    if obj is None:
-                        break
-                    obj = getattr(obj, part)
-
-                text = obj
-        if text is None:
-            text = self.none_string
+            value = getattr(obj, parts[-1], None)
+
+        if value is None:
+            value = self.none_string
 
-        if text and hasattr(row, 'get_absolute_url'):
-            return '<a href="%s">%s</a>' % (row.get_absolute_url(), text)
-        else:
-            return text
+        if value and hasattr(obj, 'get_absolute_url'):
+            return '<a href="%s">%s</a>' % (obj.get_absolute_url(), value)
+        return value
 
     def ordering(self, qs):
         """ Get parameters from the request and prepare order by clause

setup.py

@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import os
 
-version = '1.13.2'
+version = '1.14.0'
 
 here = os.path.abspath(os.path.dirname(__file__))
 README = open(os.path.join(here, 'README.md')).read()