diff --git a/seminar/migrations/0033_organizator_studuje_popisek.py b/seminar/migrations/0033_organizator_studuje_popisek.py new file mode 100644 index 00000000..07f15712 --- /dev/null +++ b/seminar/migrations/0033_organizator_studuje_popisek.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', '0032_cislo_pdf_blank_typos'), + ] + + operations = [ + migrations.AlterField( + model_name='organizator', + name='studuje', + field=models.CharField(help_text=b"Nap\xc5\x99. 'Studuje Obecnou fyziku (Bc.), 3. ro\xc4\x8dn\xc3\xadk', 'Vystudovala Diskr\xc3\xa9tn\xc3\xad modely a algoritmy (Mgr.)' nebo 'P\xc5\x99edn\xc3\xa1\xc5\xa1\xc3\xad na MFF'", max_length=256, null=True, verbose_name=b'Studium aj.', blank=True), + preserve_default=True, + ), + ] diff --git a/seminar/models.py b/seminar/models.py index c55eaa52..3042f61e 100644 --- a/seminar/models.py +++ b/seminar/models.py @@ -772,8 +772,11 @@ class Organizator(models.Model): null = True, blank = True) organizuje_do_roku = models.IntegerField('Organizuje do roku', null = True, blank = True) - studuje = models.CharField('Studuje', max_length = 256, - null = True, blank = True) + studuje = models.CharField('Studium aj.', max_length = 256, + null = True, blank = True, + help_text="Např. 'Studuje Obecnou fyziku (Bc.), 3. ročník', " + "'Vystudovala Diskrétní modely a algoritmy (Mgr.)' nebo " + "'Přednáší na MFF'") strucny_popis_organizatora = models.TextField('Stručný popis organizátora', null = True, blank = True) foto = models.ImageField('Fotografie organizátora', diff --git a/seminar/templates/seminar/cojemam/organizatori.html b/seminar/templates/seminar/cojemam/organizatori.html index 12f3a506..0111cd20 100644 --- a/seminar/templates/seminar/cojemam/organizatori.html +++ b/seminar/templates/seminar/cojemam/organizatori.html @@ -53,7 +53,7 @@ Aktivní v letech {{org.organizuje_od_roku | default:"?" }}–{{org.organizuje_do_roku | default:"?" }} {% endif %} {% if org.studuje %} -
  • Studuje: {{org.studuje}} +
  • {{org.studuje}} {% endif %} {% if org.user.email %}
  • Pošta: