From f375f6b3e910a33315ce9a630feeb55c210a94b7 Mon Sep 17 00:00:00 2001 From: Danie Palm Date: Tue, 16 Aug 2016 21:13:38 +0200 Subject: [PATCH 1/2] Make sure column names are always titlized --- django_tables2/columns/base.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/django_tables2/columns/base.py b/django_tables2/columns/base.py index d3110aa5..cc1f1cc5 100644 --- a/django_tables2/columns/base.py +++ b/django_tables2/columns/base.py @@ -329,7 +329,7 @@ def header(self): # favour Column.header column_header = self.column.header if column_header: - return column_header + return title(column_header) # fall back to automatic best guess return self.verbose_name @@ -430,11 +430,12 @@ def verbose_name(self): """ # Favor an explicit defined verbose_name if self.column.verbose_name is not None: - return self.column.verbose_name + # return 'Broken' + return title(self.column.verbose_name) # This is our reasonable fallback, should the next section not result # in anything useful. - name = title(self.name.replace('_', ' ')) + name = self.name.replace('_', ' ') # Try to use a model field's verbose_name if hasattr(self.table.data, 'queryset') and hasattr(self.table.data.queryset, 'model'): @@ -460,7 +461,8 @@ def verbose_name(self): name = field.field.verbose_name else: name = getattr(field, 'verbose_name', field.name) - return name + return title(name) + # return 'Broekn' @property def visible(self): From 30dc4b2a67f585bf093b4deb0e907ea59c6379fb Mon Sep 17 00:00:00 2001 From: Danie Palm Date: Tue, 16 Aug 2016 21:27:09 +0200 Subject: [PATCH 2/2] Move titlization to header property --- django_tables2/columns/base.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/django_tables2/columns/base.py b/django_tables2/columns/base.py index cc1f1cc5..e7fcb331 100644 --- a/django_tables2/columns/base.py +++ b/django_tables2/columns/base.py @@ -331,7 +331,7 @@ def header(self): if column_header: return title(column_header) # fall back to automatic best guess - return self.verbose_name + return title(self.verbose_name) @property def order_by(self): @@ -430,8 +430,7 @@ def verbose_name(self): """ # Favor an explicit defined verbose_name if self.column.verbose_name is not None: - # return 'Broken' - return title(self.column.verbose_name) + return self.column.verbose_name # This is our reasonable fallback, should the next section not result # in anything useful. @@ -461,8 +460,7 @@ def verbose_name(self): name = field.field.verbose_name else: name = getattr(field, 'verbose_name', field.name) - return title(name) - # return 'Broekn' + return name @property def visible(self):