Commit 8bc53a3b by Őry Máté

dashboard: add better identifierts

parent 5195f8b3
...@@ -32,28 +32,27 @@ logger = logging.getLogger(__name__) ...@@ -32,28 +32,27 @@ logger = logging.getLogger(__name__)
@celery.task(ignore_result=True) @celery.task(ignore_result=True)
def send_email_notifications(): def send_email_notifications():
msgs = {}
q = Q( & ( q = Q( & (
Q( | Q(valid_until=None)) Q( | Q(valid_until=None))
for i in Notification.objects.filter(q):
if not in msgs:
msgs[] = []
from_email = settings.DEFAULT_FROM_EMAIL from_email = settings.DEFAULT_FROM_EMAIL
for user, i in msgs.iteritems(): recipients = {}
for i in Notification.objects.filter(q):
recipients.setdefault(, [])
for user, msgs in recipients.iteritems():
if (not user.profile or not or not if (not user.profile or not or not
user.profile.email_notifications): user.profile.email_notifications):
logger.debug("%s gets no notifications", unicode(user)) logger.debug("%s gets no notifications", unicode(user))
continue continue
with override(user.profile.preferred_language): with override(user.profile.preferred_language):
context = {'user': user.profile, 'messages': i, context = {'user': user.profile, 'messages': msgs,
'url': (settings.DJANGO_URL.rstrip("/") + 'url': (settings.DJANGO_URL.rstrip("/") +
reverse("dashboard.views.notifications")), reverse("dashboard.views.notifications")),
'site': settings.COMPANY_NAME} 'site': settings.COMPANY_NAME}
subject = ungettext("%d new notification", subject = ungettext("%d new notification",
"%d new notifications", len(i)) % len(i) "%d new notifications", len(msgs)) % len(msgs)
body = render_to_string('dashboard/notifications/email.txt', body = render_to_string('dashboard/notifications/email.txt',
context) context)
try: try:
...@@ -62,7 +61,7 @@ def send_email_notifications(): ...@@ -62,7 +61,7 @@ def send_email_notifications():
logger.error("Failed to send mail to %s", user, exc_info=True) logger.error("Failed to send mail to %s", user, exc_info=True)
else: else:"Delivered notifications %s","Delivered notifications %s",
" ".join(unicode( for j in i)) " ".join(unicode( for i in msgs))
for j in i: for i in msgs:
j.status = j.STATUS.delivered i.status = i.STATUS.delivered
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment