Merge branch 'master' into stable

This commit is contained in:
Bc. Petr Pecha 2016-10-02 12:01:29 +02:00
commit 87709a0585

View file

@ -145,9 +145,10 @@ class KorekturyView(generic.TemplateView):
if email: if email:
emails.add(email) emails.add(email)
# zodpovedny org # zodpovedny org
email_zobpovedny = oprava.pdf.org.user.email if oprava.pdf.org:
if email_zobpovedny: email_zobpovedny = oprava.pdf.org.user.email
emails.add(email_zobpovedny) if email_zobpovedny:
emails.add(email_zobpovedny)
send_mail(subject, text, from_email, list(emails)) send_mail(subject, text, from_email, list(emails))