From d7e7c9c1cb829a367636a8e7de7d5f547beb4992 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C4=9Bj=20Koci=C3=A1n?= Date: Thu, 22 Oct 2015 00:34:29 +0200 Subject: [PATCH 1/3] =?UTF-8?q?Reseni:=20defaultn=C3=AD=20forma=20je=20e-m?= =?UTF-8?q?ailem?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0034_reseni_forma_default_email.py | 20 +++++++++++++++++++ seminar/models.py | 2 +- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 seminar/migrations/0034_reseni_forma_default_email.py diff --git a/seminar/migrations/0034_reseni_forma_default_email.py b/seminar/migrations/0034_reseni_forma_default_email.py new file mode 100644 index 00000000..2d691b30 --- /dev/null +++ b/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, + ), + ] diff --git a/seminar/models.py b/seminar/models.py index ae59659d..473fc0a0 100644 --- a/seminar/models.py +++ b/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)') From 5d2ee67feb38dd3369929bf28e4e3fbbbc9b764b Mon Sep 17 00:00:00 2001 From: "Bc. Petr Pecha" Date: Thu, 22 Oct 2015 08:46:32 +0200 Subject: [PATCH 2/3] soustredeni zatim nema vlastni stranku --- seminar/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seminar/admin.py b/seminar/admin.py index 299e6c75..93956adc 100644 --- a/seminar/admin.py +++ b/seminar/admin.py @@ -363,7 +363,7 @@ class SoustredeniAdmin(reversion.VersionAdmin): list_display = ['rocnik', 'misto', 'datum_zacatku', 'typ', 'exportovat', 'verejne'] inlines = [Soustredeni_UcastniciInline] list_filter = ['typ', 'rocnik'] - view_on_site = Soustredeni.verejne_url + #view_on_site = Soustredeni.verejne_url actions = [ make_set_action('verejne_db', True, u'Zveřejnit soustředění'), make_set_action('verejne_db', False, u'Skrýt (zneveřejnit) soustředění'), From dc24f1017ae1b86879c7f0f1ddeee01cf6236284 Mon Sep 17 00:00:00 2001 From: "Bc. Petr Pecha" Date: Thu, 22 Oct 2015 08:55:42 +0200 Subject: [PATCH 3/3] zobrazit na webu -> seznam soustredeni --- seminar/admin.py | 2 +- seminar/models.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/seminar/admin.py b/seminar/admin.py index 93956adc..299e6c75 100644 --- a/seminar/admin.py +++ b/seminar/admin.py @@ -363,7 +363,7 @@ class SoustredeniAdmin(reversion.VersionAdmin): list_display = ['rocnik', 'misto', 'datum_zacatku', 'typ', 'exportovat', 'verejne'] inlines = [Soustredeni_UcastniciInline] list_filter = ['typ', 'rocnik'] - #view_on_site = Soustredeni.verejne_url + view_on_site = Soustredeni.verejne_url actions = [ make_set_action('verejne_db', True, u'Zveřejnit soustředění'), make_set_action('verejne_db', False, u'Skrýt (zneveřejnit) soustředění'), diff --git a/seminar/models.py b/seminar/models.py index 473fc0a0..1b862200 100644 --- a/seminar/models.py +++ b/seminar/models.py @@ -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