diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-11-14 19:54:52 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-11-14 19:54:52 +0100 |
| commit | 87208abf2d2616faad094f33168b491d2a4efcc8 (patch) | |
| tree | 7abaf9aa8e234bff1da2750dcd718a1068f49d29 /ishtar_common/views.py | |
| parent | 3ee168dad3aebbd07640420fbdb5136bb909038f (diff) | |
| parent | 4778f7ab57c5bbd1ec1ff6a0e3bd9e1561ddf454 (diff) | |
| download | Ishtar-87208abf2d2616faad094f33168b491d2a4efcc8.tar.bz2 Ishtar-87208abf2d2616faad094f33168b491d2a4efcc8.zip | |
Merge branch 'master' into master-trad
Diffstat (limited to 'ishtar_common/views.py')
| -rw-r--r-- | ishtar_common/views.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/ishtar_common/views.py b/ishtar_common/views.py index cd34a2019..8634125cd 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -981,8 +981,8 @@ def get_item(model, func_name, default_name, extra_request_keys=[], lnk = link_template % reverse('show-' + default_name, args=[data[0], '']) except NoReverseMatch: - print( - '"show-' + default_name + "\" args (" + logger.warning( + '**WARN "show-' + default_name + '" args (' + unicode(data[0]) + ") url not available") lnk = '' res = {'id': data[0], 'link': lnk} @@ -1027,6 +1027,8 @@ def get_item(model, func_name, default_name, extra_request_keys=[], writer = csv.writer(response, **CSV_OPTIONS) col_names = [] for field_name in table_cols: + if type(field_name) in (list, tuple): + field_name = " ; ".join(field_name) if hasattr(model, 'EXTRA_FULL_FIELDS_LABELS') and\ field_name in model.EXTRA_FULL_FIELDS_LABELS: field = model.EXTRA_FULL_FIELDS_LABELS[field_name] @@ -1037,6 +1039,11 @@ def get_item(model, func_name, default_name, extra_request_keys=[], field = model._meta.get_field(field_name) except: col_names.append(u"".encode(ENCODING)) + logger.warning( + "**WARN get_item - csv export**: no col name for " + "{}\nadd explicit label to " + "EXTRA_FULL_FIELDS_LABELS attribute of " + "{}".format(field_name, model)) continue col_names.append( unicode(field.verbose_name).encode(ENCODING)) |