diff --git a/seminar/migrations/0025_zmena_cesty_nahravani_obrazku.py b/seminar/migrations/0025_zmena_cesty_nahravani_obrazku.py new file mode 100644 index 00000000..23e02c95 --- /dev/null +++ b/seminar/migrations/0025_zmena_cesty_nahravani_obrazku.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('seminar', '0024_add_organizator'), + ] + + operations = [ + migrations.AlterField( + model_name='organizator', + name='foto', + field=models.ImageField(help_text=b'Vlo\xc5\xbe fotografii organiz\xc3\xa1tora o libovon\xc3\xa9 velikosti', upload_to=b'image_organizatori/velke/%Y/', null=True, verbose_name=b'Fotografie organiz\xc3\xa1tora', blank=True), + preserve_default=True, + ), + ] diff --git a/seminar/models.py b/seminar/models.py index bc7f6b43..66c65bb6 100644 --- a/seminar/models.py +++ b/seminar/models.py @@ -681,7 +681,7 @@ class Organizator(models.Model): strucny_popis_organizatora = models.TextField('Stručný popis organizátora', null = True, blank = True) foto = models.ImageField('Fotografie organizátora', - upload_to='image_organizatori/%Y/', null = True, blank = True, + upload_to='image_organizatori/velke/%Y/', null = True, blank = True, help_text = 'Vlož fotografii organizátora o libovoné velikosti') foto_male = models.ImageField(upload_to='image_organizatori/male/%Y/', null = True, blank = True, editable = False) diff --git a/seminar/templates/seminar/cojemam/organizatori.html b/seminar/templates/seminar/cojemam/organizatori.html index 5c644f47..2d1f6ec9 100644 --- a/seminar/templates/seminar/cojemam/organizatori.html +++ b/seminar/templates/seminar/cojemam/organizatori.html @@ -4,6 +4,35 @@

Organizátoři

+ {% for org in object_list %} + {{org.user.first_name}} + {% if org.prezdivka %} + "{{org.prezdivka}}" + {% endif %} + {{org.user.last_name}}
+ + {% if org.foto %} +
+ + + {% endif %} +
+ {% endfor %} +
{% endblock content %} diff --git a/seminar/views.py b/seminar/views.py index 4c5063be..c6cdc177 100644 --- a/seminar/views.py +++ b/seminar/views.py @@ -5,7 +5,7 @@ from django.views import generic from django.utils.translation import ugettext as _ from django.http import Http404 -from .models import Problem, Cislo, Reseni, VysledkyKCislu, Nastaveni, Rocnik, Soustredeni +from .models import Problem, Cislo, Reseni, VysledkyKCislu, Nastaveni, Rocnik, Soustredeni, Organizator def AktualniZadaniView(request): @@ -17,7 +17,8 @@ def AktualniZadaniView(request): # Co je M&M -class CojemamOrganizatoriView(generic.TemplateView): +class CojemamOrganizatoriView(generic.ListView): + model = Organizator template_name='seminar/cojemam/organizatori.html' class CislaView(generic.ListView):