diff --git a/emencia/django/newsletter/models.py b/emencia/django/newsletter/models.py index 1b0f6fb8..4423c74a 100644 --- a/emencia/django/newsletter/models.py +++ b/emencia/django/newsletter/models.py @@ -251,18 +251,18 @@ class Contact(models.Model): # recommended paid_recommend = NewsletterRecommend.objects.filter( - fr__gte=date, - to__lte=date) + fr__lte=date, + to__gte=date) recommended = SearchQuerySet().models(Exposition, Conference)\ .filter(expohit=True, data_begin__gte=date) if th_tg_filter: paid_recommend = list(paid_recommend.filter(theme__in=th_tg_structure.keys())) recommended = recommended.filter(th_tg_filter) try: - ctx['recommended'] = choice(paid_recommend) + ctx['recommended'] = choice(paid_recommend).event() except: try: - ctx['recommended'] = recommended[0] + ctx['recommended'] = recommended[0].object except: pass diff --git a/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html b/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html index 342788c0..ed70e22d 100644 --- a/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html +++ b/emencia/django/newsletter/templates/newsletter/AutomaticEmail_v2.html @@ -101,7 +101,7 @@ {% if recommended %} - {% with recommended.object as obj %} + {% with recommended as obj %} @@ -120,17 +120,18 @@ diff --git a/emencia/django/newsletter/templates/newsletter/AutomaticEmail_web.html b/emencia/django/newsletter/templates/newsletter/AutomaticEmail_web.html index 389809d0..b6fc5bfd 100644 --- a/emencia/django/newsletter/templates/newsletter/AutomaticEmail_web.html +++ b/emencia/django/newsletter/templates/newsletter/AutomaticEmail_web.html @@ -116,7 +116,7 @@
- - - - + {% if obj.get_event_place_name %} + + + + {% endif %} @@ -141,7 +142,7 @@
- - - - - -
{{ obj.get_event_place_name }}
-
+ + + + + +
{{ obj.get_event_place_name }}
+
{{ obj.name|safe }}
- +
{{ obj.get_dates_v2 }}, {{ obj.get_event_place_name }}{{ obj.get_dates_v2 }}{% if obj.get_event_place_name %}, {{ obj.get_event_place_name }}{% endif %}
{% if recommended %} - {% with recommended.object as obj %} + {% with recommended as obj %} @@ -141,13 +141,14 @@
- - - - + {% if obj.get_event_place_name %} + + + + {% endif %} @@ -155,7 +156,7 @@ @@ -229,7 +230,7 @@ @@ -337,7 +338,7 @@ @@ -416,7 +417,7 @@
- - {{ obj.get_event_place_name }} -
+ + {{ obj.get_event_place_name }} +
{{ obj.name|safe }}
- {{ obj.get_dates }}, {{ obj.get_event_place_name }} + {{ obj.get_dates_v2 }}{% if obj.get_event_place_name %}, {{ obj.get_event_place_name }}{% endif %}
- {{ obj.get_dates }} + {{ obj.get_dates_v2 }}
- {{ obj.get_dates }} + {{ obj.get_dates_v2 }}
- {{ obj.get_dates }} + {{ obj.get_dates_v2 }}