From 73646eb05f5ef1754ccb5f2d73e1048238234edc Mon Sep 17 00:00:00 2001 From: Kuroshini Date: Sat, 5 Oct 2019 18:08:58 +0300 Subject: [PATCH] News email #2 --- apps/news/tasks.py | 10 +++++++++- project/templates/news/news_email.html | 18 +++++++++--------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/apps/news/tasks.py b/apps/news/tasks.py index beed2060..c2b63b48 100644 --- a/apps/news/tasks.py +++ b/apps/news/tasks.py @@ -8,6 +8,8 @@ from django.template.loader import render_to_string from django.conf import settings from smtplib import SMTPException from django.template.loader import get_template +from django.core.validators import EMPTY_VALUES +from main.models import SiteSettings @shared_task @@ -16,17 +18,23 @@ def send_email_with_news(news_ids): sent_news = models.News.objects.filter(id__in=news_ids) htmly = get_template(settings.NEWS_EMAIL_TEMPLATE) year = datetime.now().year + socials = list(SiteSettings.objects.with_country()) + socials = dict(zip(map(lambda s: s.country.code, socials), socials)) for s in subscribers: + socials_for_subscriber = socials.get(s.country_code) try: for n in sent_news: context = {"title": n.title.get(s.locale), "subtitle": n.subtitle.get(s.locale), "description": n.description.get(s.locale), "code": s.update_code, - "image_url": n.image_url, + "image_url": n.image_url if n.image_url not in EMPTY_VALUES else None, "domain_uri": settings.DOMAIN_URI, "slug": n.slug, "country_code": s.country_code, + "twitter_page_url": socials_for_subscriber.twitter_page_url if socials_for_subscriber else '#', + "instagram_page_url": socials_for_subscriber.instagram_page_url if socials_for_subscriber else '#', + "facebook_page_url": socials_for_subscriber.facebook_page_url if socials_for_subscriber else '#', "send_to": s.send_to, "year": year} send_mail("G&M News", render_to_string(settings.NEWS_EMAIL_TEMPLATE, context), diff --git a/project/templates/news/news_email.html b/project/templates/news/news_email.html index dd4dea5b..33ebe29c 100644 --- a/project/templates/news/news_email.html +++ b/project/templates/news/news_email.html @@ -33,30 +33,30 @@ {% endif %} -
+
{{ description | safe }}
- +