From cfa005267362aaf14cde257019381f55a1120da1 Mon Sep 17 00:00:00 2001 From: Pavel 'LEdoian' Turinsky Date: Thu, 21 Nov 2019 18:36:51 +0100 Subject: [PATCH 1/3] =?UTF-8?q?Nastavit=20ro=C4=8Dn=C3=ADk=20podle=20aktu?= =?UTF-8?q?=C3=A1ln=C3=ADho=20=C4=8D=C3=ADsla?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seminar/models.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/seminar/models.py b/seminar/models.py index 122f7c70..f7ef945c 100644 --- a/seminar/models.py +++ b/seminar/models.py @@ -1481,12 +1481,15 @@ class Nastaveni(SingletonModel): db_table = 'seminar_nastaveni' verbose_name = 'Nastavení semináře' - aktualni_rocnik = models.ForeignKey(Rocnik, verbose_name='aktuální ročník', - null=False, on_delete=models.PROTECT) +# aktualni_rocnik = models.ForeignKey(Rocnik, verbose_name='aktuální ročník', +# null=False, on_delete=models.PROTECT) aktualni_cislo = models.ForeignKey(Cislo, verbose_name='poslední vydané číslo', null=False, on_delete=models.PROTECT) + def aktualni_rocnik(self): + return self.aktualni_cislo.rocnik + def __str__(self): return 'Nastavení semináře' From 8b9049add9a76ed1a780766cdc2d3e9b7f2f405e Mon Sep 17 00:00:00 2001 From: Pavel 'LEdoian' Turinsky Date: Thu, 21 Nov 2019 18:37:53 +0100 Subject: [PATCH 2/3] =?UTF-8?q?Testdata:=20nenastavovat=20ro=C4=8Dn=C3=ADk?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- seminar/testutils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/seminar/testutils.py b/seminar/testutils.py index 1e853d72..204c0ea6 100644 --- a/seminar/testutils.py +++ b/seminar/testutils.py @@ -600,5 +600,5 @@ def create_test_data(size = 6, rnd = None): # obecné nastavení semináře, musí být už přidané ročníky a čísla, jinak se nastaví divně - nastaveni = Nastaveni.objects.create(aktualni_rocnik = Rocnik.objects.last(), + nastaveni = Nastaveni.objects.create( aktualni_cislo = Cislo.objects.all()[1]) From b7497b37d906f06e9cb5a3a7849039f4a847e836 Mon Sep 17 00:00:00 2001 From: Pavel 'LEdoian' Turinsky Date: Thu, 21 Nov 2019 18:39:12 +0100 Subject: [PATCH 3/3] =?UTF-8?q?Migrace=20ru=C5=A1=C3=ADc=C3=AD=20akt.=20ro?= =?UTF-8?q?=C4=8Dn=C3=ADk=20z=20nastaven=C3=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0070_remove_nastaveni_aktualni_rocnik.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 seminar/migrations/0070_remove_nastaveni_aktualni_rocnik.py diff --git a/seminar/migrations/0070_remove_nastaveni_aktualni_rocnik.py b/seminar/migrations/0070_remove_nastaveni_aktualni_rocnik.py new file mode 100644 index 00000000..6032c1ee --- /dev/null +++ b/seminar/migrations/0070_remove_nastaveni_aktualni_rocnik.py @@ -0,0 +1,17 @@ +# Generated by Django 2.2.7 on 2019-11-21 17:38 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('seminar', '0069_auto_20191120_2115'), + ] + + operations = [ + migrations.RemoveField( + model_name='nastaveni', + name='aktualni_rocnik', + ), + ]