Merge branch 'master' into stable

seminar/migrations/0034_reseni_forma_default_email.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', '0033_organizator_studuje_popisek'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='reseni',
+            name='forma',
+            field=models.CharField(default=b'email', max_length=16, verbose_name='forma \u0159e\u0161en\xed', choices=[(b'papir', 'Pap\xedrov\xe9 \u0159e\u0161en\xed'), (b'email', 'Emailem'), (b'upload', 'Upload p\u0159es web')]),
+            preserve_default=True,
+        ),
+    ]

seminar/models.py

@@ -522,7 +522,7 @@ class Reseni(SeminarModelBase):
         (FORMA_EMAIL, u'Emailem'),
         (FORMA_UPLOAD, u'Upload přes web'),
         ]
-    forma = models.CharField(u'forma řešení', max_length=16, choices=FORMA_CHOICES, blank=False, default=FORMA_PAPIR)
+    forma = models.CharField(u'forma řešení', max_length=16, choices=FORMA_CHOICES, blank=False, default=FORMA_EMAIL)
 
     poznamka = models.TextField(u'neveřejná poznámka', blank=True,
         help_text=u'Neveřejná poznámka k řešení (plain text)')
@@ -626,7 +626,8 @@ class Soustredeni(SeminarModelBase):
     verejne.boolean = True
 
     def verejne_url(self):
-        return reverse('seminar_soustredeni', kwargs={'pk': self.id})
+        #return reverse('seminar_soustredeni', kwargs={'pk': self.id})
+        return reverse('seminar_seznam_soustredeni')
 
 
 @python_2_unicode_compatible