openstack
/
horizon
Code Issues Proposed changes

Merge "Fix horizon.tables.Column __init__ method."

This commit is contained in:
Jenkins 2013-10-28 06:17:40 +00:00 committed by Gerrit Code Review
parent 0c53378fdc 87265bc4d6
commit 01d7ea745a
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
horizon/tables/base.py
View File

@ -63,7 +63,8 @@ class Column(html.HTMLElement):
The name for this column which should be used for display purposes.
Defaults to the value of ``transform`` with the first letter
of each word capitalized.
of each word capitalized if the ``transform`` is not callable,
otherwise it defaults to an empty string (``""``).
.. attribute:: sortable
@ -216,20 +217,22 @@ class Column(html.HTMLElement):
if callable(transform):
self.transform = transform
self.name = transform.__name__
self.name = "<%s callable>" % transform.__name__
else:
self.transform = unicode(transform)
self.name = self.transform
# Empty string is a valid value for verbose_name
if verbose_name is None:
verbose_name = self.transform.title()
if callable(transform):
self.verbose_name = ''
else:
self.verbose_name = self.transform.title()
else:
verbose_name = verbose_name
self.verbose_name = verbose_name
self.auto = auto
self.sortable = sortable
self.verbose_name = verbose_name
self.link = link
self.allowed_data_types = allowed_data_types
self.hidden = hidden