diff --git a/seminar/models.py b/seminar/models.py index 6674239f..d54a5868 100644 --- a/seminar/models.py +++ b/seminar/models.py @@ -612,7 +612,12 @@ class Organizator(models.Model): options={'quality': 95}) def __str__(self): - return str(self.user) + if self.prezdivka: + return u"%s '%s' %s" % (self.user.first_name, + self.prezdivka, + self.user.last_name) + else: + return u"%s %s" % (self.user.first_name, self.user.last_name) class Meta: verbose_name = 'Organizátor' diff --git a/seminar/templates/seminar/soustredeni/seznam_soustredeni.html b/seminar/templates/seminar/soustredeni/seznam_soustredeni.html index f7bc73a8..4c863fc4 100644 --- a/seminar/templates/seminar/soustredeni/seznam_soustredeni.html +++ b/seminar/templates/seminar/soustredeni/seznam_soustredeni.html @@ -60,16 +60,27 @@ {% autoescape off %}{{soustredeni.text}}{% endautoescape %} {% endif %} {% if user.is_authenticated %} +
{% for i in soustredeni.soustredeni_ucastnici_set.all %} -
+ {% for i in soustredeni.soustredeni_organizatori_set.all %} + {{i.organizator}}{% if forloop.last %}.{% else %},{% endif %} + {% empty %} + Nic! + {% endfor %} +
{% endif %} +