diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-06 20:07:45 +0100 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2017-02-06 20:07:45 +0100 |
| commit | 51dc338f873efa8f5c79f5ec4a5723ee9e5be26c (patch) | |
| tree | 058d8317204500766ffc94701a2a40d52851cdc3 /ishtar_common/views.py | |
| parent | 6979f76c94daae084eb0c5525e1a65734c97555f (diff) | |
| parent | 53c4caf13113c8f84bb037e325c4a3c982c49682 (diff) | |
| download | Ishtar-51dc338f873efa8f5c79f5ec4a5723ee9e5be26c.tar.bz2 Ishtar-51dc338f873efa8f5c79f5ec4a5723ee9e5be26c.zip | |
Merge branch 'master' into v0.9
Diffstat (limited to 'ishtar_common/views.py')
| -rw-r--r-- | ishtar_common/views.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ishtar_common/views.py b/ishtar_common/views.py index 467401b8f..c9eb9fec8 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -73,7 +73,7 @@ from ishtar_common.models import HistoryError, PRIVATE_FIELDS, \ import models -CSV_OPTIONS = {'delimiter': ';', 'quotechar': '"', 'quoting': csv.QUOTE_ALL} +CSV_OPTIONS = {'delimiter': ',', 'quotechar': '"', 'quoting': csv.QUOTE_ALL} ENCODING = settings.ENCODING or 'utf-8' logger = logging.getLogger(__name__) @@ -993,7 +993,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[], new_vals.append(u"{}{}{}".format( vals[idx], u' - ', format_val(v))) my_vals = new_vals[:] - data.append(" ; ".join(my_vals) or u"") + data.append(u" & ".join(my_vals) or u"") datas.append(data) if manual_sort_key: # +1 because the id is added as a first col @@ -1068,7 +1068,7 @@ def get_item(model, func_name, default_name, extra_request_keys=[], col_names = [] for field_name in table_cols: if type(field_name) in (list, tuple): - field_name = " ; ".join(field_name) + 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] |