Mercurial > public > sg101
comparison messages/views.py @ 893:3aecf9058130
Merge with upstream.
author | Brian Neal <bgneal@gmail.com> |
---|---|
date | Tue, 17 Feb 2015 18:59:06 -0600 |
parents | 79a71b9d0a2a |
children | 62cfdddd584a |
comparison
equal
deleted
inserted
replaced
889:ae146e30d588 | 893:3aecf9058130 |
---|---|
397 'site': site, | 397 'site': site, |
398 'user': user, | 398 'user': user, |
399 'msgs': msgs, | 399 'msgs': msgs, |
400 'admin_email': admin_email, | 400 'admin_email': admin_email, |
401 }) | 401 }) |
402 send_mail(subject, msg_body, from_email, [email_addr], defer=False) | 402 send_mail(subject, msg_body, from_email, [email_addr]) |
403 | 403 |
404 msg = '{} message{} sent to email.'.format(count, '' if count == 1 else 's') | 404 msg = '{} message{} sent to email.'.format(count, '' if count == 1 else 's') |
405 if count > 0: | 405 if count > 0: |
406 django_messages.success(request, msg) | 406 django_messages.success(request, msg) |
407 else: | 407 else: |