diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-10-17 19:24:28 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-10-17 19:24:28 +0200 |
| commit | 64bb69c03ce1688c72b3f7ebd0e1550cd941aa69 (patch) | |
| tree | 904d5a6c1c12572d5a81ed7831deabfb3cc08828 /ishtar_common/widgets.py | |
| parent | f102f5855c878f35a529aa6e1947e7516a1a67fa (diff) | |
| parent | 461e0320a8426fe82c4f6a7fd9cfa376c767fbdd (diff) | |
| download | Ishtar-64bb69c03ce1688c72b3f7ebd0e1550cd941aa69.tar.bz2 Ishtar-64bb69c03ce1688c72b3f7ebd0e1550cd941aa69.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'ishtar_common/widgets.py')
| -rw-r--r-- | ishtar_common/widgets.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ishtar_common/widgets.py b/ishtar_common/widgets.py index 89eead988..48d1377fa 100644 --- a/ishtar_common/widgets.py +++ b/ishtar_common/widgets.py @@ -564,6 +564,8 @@ class JQueryJqGrid(forms.RadioSelect): field_verbose_names.append(unicode(field_verbose_name)) if field_name in col_labels: jq_col_names.append(unicode(col_labels[field_name])) + elif col_names and col_names[0] in col_labels: + jq_col_names.append(unicode(col_labels[col_names[0]])) else: jq_col_names.append(settings.JOINT.join( [f for f in field_verbose_names if f])) |