From cbd305eec6c183e1bfe625fa2fc3aeff1477b132 Mon Sep 17 00:00:00 2001
From: Alexander Burdeinyi <bonus05@gmail.com>
Date: Tue, 13 Dec 2016 16:54:53 +0200
Subject: [PATCH] m

---
 .../newsletter/templates/newsletter/AutomaticEmail_v2.html   | 4 ++--
 .../newsletter/templates/newsletter/AutomaticEmail_web.html  | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html b/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html
index 99200671..342788c0 100644
--- a/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html
+++ b/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html
@@ -411,11 +411,11 @@
 
                                                         <tr>
                                                           <td style="font-family: Arial, sans-serif; font-size: 13px; text-transform: uppercase; padding-bottom: 12px; {% if forloop.first %}color: #33ccff; {% elif forloop.counter == 2 %}color: #cc3399; {% elif forloop.counter == 3 %}color: #99cc66;{% elif forloop.counter == 4 %}color: #ff6600;{% endif %}">
-                                                          {% if obj.get_event_place_name %}
+                                                          {% if obj.city %}
                                                               <table border="0" cellpadding="0" cellspacing="0">
                                                                 <tr>
                                                                     <td style="padding-right: 5px;"><img src="cid:m{{ forloop.counter }}" alt=""></td>
-                                                                    <td>{{ obj.get_event_place_name }}</td>
+                                                                    <td>{{ obj.city }}</td>
                                                                 </tr>
                                                               </table>
                                                           {% endif %}
diff --git a/emencia/django/newsletter/templates/newsletter/AutomaticEmail_web.html b/emencia/django/newsletter/templates/newsletter/AutomaticEmail_web.html
index d09b1197..44a96a86 100644
--- a/emencia/django/newsletter/templates/newsletter/AutomaticEmail_web.html
+++ b/emencia/django/newsletter/templates/newsletter/AutomaticEmail_web.html
@@ -1,6 +1,7 @@
 {% load i18n %}
 {% load static %}
 {% load thumbnail %}
+{% load template_filters %}
 
 {# <a href="http://{{ domain }}{% url 'events:main' %}?{{ moscow_filter_url }}">{% trans "ПОСМОТРЕТЬ ВСЕ" %} ></a> #}
 {# <a href="http://{{ domain }}{% url 'events:main' %}?{{ russia_filter_url }}">{% trans "ПОСМОТРЕТЬ ВСЕ" %} ></a> #}
@@ -403,9 +404,9 @@
                                                             </tr>
                                                             <tr>
                                                               <td class="color{{ forloop.counter }}" style="font-family: Arial, sans-serif; font-size: 13px; text-transform: uppercase; padding-bottom: 12px;">
-                                                              {% if obj.get_event_place_name %}
+                                                              {% if obj.city %}
                                                                 <img src="{{ STATIC_URL }}newsletter/images/m{{ forloop.counter }}.png" alt="" style="display: inline-block; margin-top: -2px; vertical-align: middle; margin-right: 4px;">
-                                                                {{ obj.get_event_place_name }}
+                                                                {{ obj.city }}
                                                               {% endif %}
                                                               </td>
                                                             </tr>