mam/mamweb
13
1
Fork 0
Code Issues Pull requests 12 Projects Wiki Activity Actions

Korektury funguji v novem modelu.

Browse source
This commit is contained in:
Tomas "Jethro" Pokorny 2019-05-19 10:22:00 +02:00
parent 4a359615fd
commit 085dc6ad48
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
korektury/models.py
View file

@ -155,7 +155,7 @@ class Oprava(models.Model):
# setattr(self,k,v)
def __str__(self):
return force_unicode(u'%s od %s: %s'%(self.status,self.autor,self.text))
return '{} od {}: {}'.format(self.status,self.autor,self.text)
@ -181,7 +181,7 @@ class Komentar(models.Model):
text = models.TextField(u'text komentáře',blank = True, help_text='Text komentáře')
def __str__(self):
return force_unicode(u'%s od %s: %s'%(self.cas,self.autor,self.text))
return '{} od {}: {}'.format(self.cas,self.autor,self.text)

10
korektury/views.py
View file

@ -35,7 +35,7 @@ class KorekturyView(generic.TemplateView):
# prirazeni autora podle prihlaseni
autor_user = request.user
# pokud existuje ucet (user), ale neni to organizator = 403
autor = Organizator.objects.filter(user=autor_user).first()
autor = Organizator.objects.filter(osoba__user=autor_user).first()
if not autor:
return HttpResponseForbidden()
@ -133,24 +133,24 @@ class KorekturyView(generic.TemplateView):
# Prijemci e-mailu
emails = set()
# e-mail autora korektury
email = oprava.autor.user.email
email = oprava.autor.osoba.email
if email:
emails.add(email)
# nalezeni e-mailu na autory komentaru
for komentar in oprava.komentar_set.all():
email_komentujiciho = komentar.autor.user.email
email_komentujiciho = komentar.autor.osoba.email
if email_komentujiciho:
emails.add(email_komentujiciho)
# zodpovedny org
if oprava.pdf.org:
email_zobpovedny = oprava.pdf.org.user.email
email_zobpovedny = oprava.pdf.org.osoba.email
if email_zobpovedny:
emails.add(email_zobpovedny)
# odstran e-mail autora opravy
email = autor.user.email
email = autor.osoba.email
if email:
emails.discard(email)