From 46f1d3d42ddb23d8e0e30c9b061801520eb2c421 Mon Sep 17 00:00:00 2001 From: Pavel 'LEdoian' Turinsky Date: Tue, 19 Mar 2024 22:15:29 +0100 Subject: [PATCH] I did something! --- various/migrations/0001_initial.py | 1 + .../0004_nastaveni_aktualni_cislo.py | 21 ------------------- various/models.py | 7 +------ 3 files changed, 2 insertions(+), 27 deletions(-) delete mode 100644 various/migrations/0004_nastaveni_aktualni_cislo.py diff --git a/various/migrations/0001_initial.py b/various/migrations/0001_initial.py index 38f2a029..43b77171 100644 --- a/various/migrations/0001_initial.py +++ b/various/migrations/0001_initial.py @@ -28,6 +28,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('cena_sous', models.IntegerField(default=1000, verbose_name='Účastnický poplatek za soustředění')), + ('aktualni_cislo', models.ForeignKey(null=True, on_delete=models.deletion.PROTECT, to='seminar.cislo', verbose_name='Aktuální číslo')), ], options={ 'verbose_name': 'Nastavení semináře', diff --git a/various/migrations/0004_nastaveni_aktualni_cislo.py b/various/migrations/0004_nastaveni_aktualni_cislo.py deleted file mode 100644 index feb6bc71..00000000 --- a/various/migrations/0004_nastaveni_aktualni_cislo.py +++ /dev/null @@ -1,21 +0,0 @@ -# Generated by Django 4.2.8 on 2024-03-12 20:44 - -from django.db import migrations, models -import django.db.models.deletion -import various.models - - -class Migration(migrations.Migration): - - dependencies = [ - ('seminar', '0118_alter_organizator_options_alter_osoba_options_and_more'), - ('various', '0003_fix_permissions'), - ] - - operations = [ - migrations.AddField( - model_name='nastaveni', - name='aktualni_cislo', - field=models.ForeignKey(default=various.models._default_aktualni_cislo, on_delete=django.db.models.deletion.PROTECT, to='seminar.cislo', verbose_name='Aktuální číslo'), - ), - ] diff --git a/various/models.py b/various/models.py index f551a652..17632c46 100644 --- a/various/models.py +++ b/various/models.py @@ -7,10 +7,6 @@ from seminar.models import Cislo from django.urls import reverse -# Whatever, makemigrations chce default, má ho mít lol. -def _default_aktualni_cislo(): - return Cislo.objects.last().id - @reversion.register(ignore_duplicates=True) class Nastaveni(SingletonModel): @@ -22,8 +18,7 @@ class Nastaveni(SingletonModel): # null=False, on_delete=models.PROTECT) aktualni_cislo = models.ForeignKey(Cislo, verbose_name='Aktuální číslo', - null=False, on_delete=models.PROTECT, - default=_default_aktualni_cislo, + null=True, blank=False, on_delete=models.PROTECT, ) cena_sous = models.IntegerField(null=False,