From e074c10aeb19b7f620d913663e5c5b14ea88f1bb Mon Sep 17 00:00:00 2001 From: Alexander Burdeiny Date: Wed, 19 Oct 2016 16:03:36 +0300 Subject: [PATCH] 1577 email fixes --- accounts/urls.py | 2 +- emencia/django/newsletter/models.py | 6 ++-- .../templates/newsletter/AutomaticEmail.html | 28 +++++++++++-------- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/accounts/urls.py b/accounts/urls.py index fdf29d2e..71451d28 100644 --- a/accounts/urls.py +++ b/accounts/urls.py @@ -22,7 +22,7 @@ from views import ( urlpatterns = patterns('', url(r'^profile/company/$', login_required(ProfileCompanyView.as_view())), url(r'^profile/mailing/$', MailingSettings.as_view(), name='accounts-mailing_settings'), - url(r'^profile/mailing/unsubscribe/$', login_required(MailingSettingsUnsubscribe.as_view()), name='accounts-mailing_settings_unsubscribe'), + url(r'^profile/mailing/unsubscribe/$', MailingSettingsUnsubscribe.as_view(), name='accounts-mailing_settings_unsubscribe'), url(r'^profile/settings/$', login_required(SettingsView.as_view()), name='accounts_settings'), url(r'^profile/calendar/remove/$', 'accounts.views.remove_from_calendar'), url(r'^profile/calendar/export/$', 'core.views.download_workbook'), diff --git a/emencia/django/newsletter/models.py b/emencia/django/newsletter/models.py index c31612d9..aacae032 100644 --- a/emencia/django/newsletter/models.py +++ b/emencia/django/newsletter/models.py @@ -256,7 +256,7 @@ class Contact(models.Model): ctx['moscow'] = moscow_sqs.order_by('data_begin')[:4] moscow_filter_url = QueryDict('', mutable=True) moscow_filter_url.setlist('theme', th_tg_structure.keys()) - moscow_filter_url.setlist('tag', list(chain(th_tg_structure.values()))) + moscow_filter_url.setlist('tag', list(chain(*th_tg_structure.values()))) moscow_filter_url['city'] = settings.MOSCOW_PK moscow_filter_url['date_from'] = date.strftime('%d.%m.%Y') ctx['moscow_filter_url'] = mark_safe(moscow_filter_url.urlencode()) @@ -275,7 +275,7 @@ class Contact(models.Model): ctx['russia'] = russia_sqs.order_by('data_begin')[:3] russia_filter_url = QueryDict('', mutable=True) russia_filter_url.setlist('theme', th_tg_structure.keys()) - russia_filter_url.setlist('tag', list(chain(th_tg_structure.values()))) + russia_filter_url.setlist('tag', list(chain(*th_tg_structure.values()))) russia_filter_url['country'] = settings.RUSSIA_PK russia_filter_url['date_from'] = r_date.strftime('%d.%m.%Y') ctx['russia_filter_url'] = mark_safe(russia_filter_url.urlencode()) @@ -304,7 +304,7 @@ class Contact(models.Model): ctx['foreign'] = foreign_sqs.order_by('data_begin')[:4] foreign_filter_url = QueryDict('', mutable=True) foreign_filter_url.setlist('theme', th_tg_structure.keys()) - foreign_filter_url.setlist('tag', list(chain(th_tg_structure.values()))) + foreign_filter_url.setlist('tag', list(chain(*th_tg_structure.values()))) foreign_filter_url.setlist('country', f_countries) foreign_filter_url['date_from'] = date.strftime('%d.%m.%Y') ctx['foreign_filter_url'] = mark_safe(foreign_filter_url.urlencode()) diff --git a/emencia/django/newsletter/templates/newsletter/AutomaticEmail.html b/emencia/django/newsletter/templates/newsletter/AutomaticEmail.html index 2fab5848..97595683 100644 --- a/emencia/django/newsletter/templates/newsletter/AutomaticEmail.html +++ b/emencia/django/newsletter/templates/newsletter/AutomaticEmail.html @@ -57,11 +57,11 @@
- + - +
@@ -296,12 +296,12 @@ - + {% for sqs_obj in foreign %} {% with sqs_obj.object as obj %} -
+ @@ -567,10 +567,14 @@
@@ -544,8 +544,8 @@
{% trans "Поисковик деловых событий" %}
- expomap.ru
- mail@expomap.ru + expomap.ru
+ mail@expomap.ru
- - - - + + + +
{% trans "Выставки" %}{% trans "Конференции" %}{% trans "Участие в выставках" %}{% trans "Новости" %} + {% trans "Выставки" %} + {% trans "Конференции" %} + {% trans "Участие в выставках" %} + {% trans "Новости" %} {% trans "Статьи" %}
@@ -579,10 +583,10 @@ - + - +
{% trans "Вы получили это письмо, так как подписаны на рассылку" %} https://www.expomap.ru{% trans "Вы получили это письмо, так как подписаны на рассылку" %} www.expomap.ru
{% trans "Переслать другу" %} {% trans "или" %} {% trans "Отписаться" %}{% trans "Переслать другу" %} {% trans "или" %} {% trans "Отписаться" %}
© 2008 — 2016 Expomap.ru