mam/mamweb
11
0
Fork 0
Code Issues Pull requests 11 Projects Wiki Activity Actions

Merge branch 'maillink' into maillink_dev_ledoian

Browse source
This commit is contained in:
Pavel "LEdoian" Turinsky 2023-01-08 18:38:16 +01:00
commit e29bce66a4
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
odevzdavatko/templates/odevzdavatko/detail.html
View file

@ -1,6 +1,7 @@
{% extends "base.html" %}
{% load static %}
{% load deadliny %}
{% load mail %}
{% block content %}
@ -14,7 +15,10 @@
{% if edit %}
<p>Řešitelé:
{% for r in object.resitele.all %}{{ r }} (<a href="mailto:{{ r.osoba.email }}?subject={{ "Oprava řešení M&M " | urlencode }}{{ object.problem.all.0.hlavni_problem | urlencode }}">{{ r.osoba.email }}</a>){% if forloop.revcounter0 != 0 %}, {% endif %}{% endfor %}
{% for r in object.resitele.all %}
{{ r }}
({% maillink r.osoba.email to=r.osoba.email subject=mailsubject %}){% if forloop.revcounter0 != 0 %}, {% endif %}
{% endfor %}
</p>
{% else %}
<p>Řešitelé: {{ object.resitele.all | join:", " }}</p>

7
odevzdavatko/views.py
View file

@ -235,8 +235,11 @@ class DetailReseniView(DetailView):
def get_context_data(self, **kw):
self.check_access()
ctx = super().get_context_data(**kw)
hodnoceni = self.aktualni_hodnoceni()
ctx["hodnoceni"] = hodnoceni
detaily_hodnoceni = self.aktualni_hodnoceni()
ctx["hodnoceni"] = detaily_hodnoceni
# Subject případného mailu (template neumí použitelně spojovat řetězce: https://stackoverflow.com/q/4386168)
ctx["mailsubject"] = "Oprava řešení M&M "+self.reseni.problem.first().hlavni_problem.nazev
return ctx
def get(self, request, *args, **kwargs):