From cd2854ba9d57d40ae2bd95d8926345c7d63fc2b3 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 15 Mar 2017 10:00:12 +0100 Subject: Refactoring: EXTRA_FULL_FIELDS_LABELS -> COL_LABELS (with merge) (refs #3491) --- ishtar_common/views.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ishtar_common/views.py') diff --git a/ishtar_common/views.py b/ishtar_common/views.py index 95b7689ec..cbf27c8e7 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -1115,9 +1115,9 @@ def get_item(model, func_name, default_name, extra_request_keys=[], for field_name in table_cols: if type(field_name) in (list, tuple): field_name = u" & ".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] + if hasattr(model, 'COL_LABELS') and\ + field_name in model.COL_LABELS: + field = model.COL_LABELS[field_name] col_names.append(unicode(field).encode(ENCODING)) continue else: @@ -1128,7 +1128,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[], logger.warning( "**WARN get_item - csv export**: no col name " "for {}\nadd explicit label to " - "EXTRA_FULL_FIELDS_LABELS attribute of " + "COL_LABELS attribute of " "{}".format(field_name, model)) continue col_names.append( -- cgit v1.2.3