summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ishtar_common/models.py7
1 files changed, 1 insertions, 6 deletions
diff --git a/ishtar_common/models.py b/ishtar_common/models.py
index 231d1a529..c598b1e3d 100644
--- a/ishtar_common/models.py
+++ b/ishtar_common/models.py
@@ -153,7 +153,7 @@ class ValueGetter(object):
elif "type" in key and (
val.__class__.__name__.split('.')[0]
== 'ManyRelatedManager'):
- val = u" ; ".format([unicode(v) for v in val.all()])
+ val = u" ; ".join([unicode(v) for v in val.all()])
elif isinstance(val, (tuple, list, dict)):
pass
else:
@@ -169,11 +169,6 @@ class ValueGetter(object):
if key in ('KEYS', 'VALUES'):
continue
value_list.append((key, unicode(values[key])))
- """
- values['VALUES'] = u'\n'.join(
- [u"%s: %s" % (k, v) for k, v in sorted(value_list,
- key=lambda x: x[0])])
- """
for global_var in GlobalVar.objects.all():
values[global_var.slug] = global_var.value or ""
values['VALUES'] = json.dumps(