From 423a74702c7bff58cbe8f9078c5241b99ba3bb77 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Wed, 27 May 2015 01:37:50 +0200 Subject: [PATCH] fix verbose_name handling with GenericForeignKey fields under Django 1.8 GenericForeignKey now lacks a verbose_name field. --- django_tables2/columns/base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/django_tables2/columns/base.py b/django_tables2/columns/base.py index ea27678..3cdb1cf 100644 --- a/django_tables2/columns/base.py +++ b/django_tables2/columns/base.py @@ -247,7 +247,7 @@ class Column(object): # pylint: disable=R0902 if hasattr(field, "get_related_field"): verbose_name = field.get_related_field().verbose_name else: - verbose_name = field.verbose_name + verbose_name = getattr(field, 'verbose_name', field.name) return cls(verbose_name=verbose_name) @@ -483,7 +483,7 @@ class BoundColumn(object): if hasattr(field, 'field'): name = field.field.verbose_name else: - name = field.verbose_name + name = getattr(field, 'verbose_name', field.name) return name @property