From 54085c6d1b36d825e46add790d74cebfa7741d60 Mon Sep 17 00:00:00 2001
From: Alexander Burdeiny <bonus_05@mail.ru>
Date: Mon, 15 Aug 2016 12:49:56 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B1=D0=B0=D0=B3=D0=B0:=20=D0=9A?=
 =?UTF-8?q?=D1=80=D0=B8=D1=82=D0=B8=D1=87=D0=BD=D1=8B=D0=B9=20=20=D0=91?=
 =?UTF-8?q?=D0=90=D0=93=20-=20=D0=BD=D0=B0=20=D0=B4=D0=B5=D0=B2=D0=B5=20?=
 =?UTF-8?q?=D0=BD=D0=B5=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D1=8E=D1=82?=
 =?UTF-8?q?=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BA=D1=80=D0=B5=D1=81=D1=82=D0=BD?=
 =?UTF-8?q?=D1=8B=D0=B5=20=D1=80=D1=83=D0=B1=D1=80=D0=B8=D0=BA=D0=B0=D1=82?=
 =?UTF-8?q?=D0=BE=D1=80=D0=B0=20=D0=A2=D0=B5=D0=BC=D0=B0+=20=D0=B3=D0=BE?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B4,=20=D1=82=D0=B5=D0=BC=D0=B0=20+=20=D1=81?=
 =?UTF-8?q?=D1=82=D1=80=D0=B0=D0=BD=D0=B0,=20=D1=82=D0=B0=D0=BC=20=D0=BD?=
 =?UTF-8?q?=D0=B5=20=D1=81=D0=BC=D0=BE=D0=B3=D0=BB=D0=B0=20=D0=BF=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B5=D1=80=D0=B8=D1=82=D1=8C=20=D1=84=D0=B8=D0=BB?=
 =?UTF-8?q?=D1=8C=D1=82=D1=80=D1=8B.=20https://dev.expomap.ru/expo/theme/p?=
 =?UTF-8?q?roduktyi-pischevaya-industriya/country/russia/?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 settings/templatetags/template_filters.py | 6 ++++++
 templates/client/blank.html               | 8 ++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/settings/templatetags/template_filters.py b/settings/templatetags/template_filters.py
index 3bc70928..e8d892fb 100644
--- a/settings/templatetags/template_filters.py
+++ b/settings/templatetags/template_filters.py
@@ -341,3 +341,9 @@ def get_pages(objects, number):
 @register.filter
 def lowfirst(value):
     return value[:1].lower() + value[1:] if value else ''
+
+@register.filter
+def join_lookup(value):
+    if isinstance(value, list):
+        return ", ".join(value)
+    return getattr(value, 'pk', '')
diff --git a/templates/client/blank.html b/templates/client/blank.html
index f2e230aa..aa6ea4e0 100644
--- a/templates/client/blank.html
+++ b/templates/client/blank.html
@@ -55,10 +55,10 @@ This template include basic anf main styles and js files,
     <!--test expo_b -->
     <script>
         window.sendData = {
-            "theme": [{{ themes|join:", " }}],
-            "country": [{{ country|join:", " }}],
-            "city": [{{ city|join:", " }}],
-            "tag": [{{ tag|join:", " }}],
+            "theme": [{{ themes|join_lookup }}],
+            "country": [{{ country|join_lookup }}],
+            "city": [{{ city|join_lookup }}],
+            "tag": [{{ tag|join_lookup }}],
             "month": "{{ month.slug }}",
             "year": "{{ year.text }}",
             "event_type": "{{ event_type }}",