Merge branch 'fix/school-term-validity-range' into 'master'

Fix migrations for validity range

See merge request !69

aleksis/apps/chronos/migrations/0002_school_term_validity.py

@@ -42,7 +42,7 @@ def migrate_lesson(apps, schema_editor):
 
 class Migration(migrations.Migration):
     dependencies = [
-        ("core", "0003_auto_20200627_1600"),
+        ("core", "0002_school_term"),
         ("sites", "0002_alter_domain_unique"),
         ("chronos", "0001_initial"),
     ]

aleksis/apps/chronos/migrations/0003_school_term_validity_fixes.py

+# Generated by Django 3.0.7 on 2020-06-30 10:46
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('chronos', '0002_school_term_validity'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='break',
+            name='school_term',
+        ),
+        migrations.AddField(
+            model_name='break',
+            name='validity',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to='chronos.ValidityRange', verbose_name='Linked validity range'),
+        ),
+        migrations.AlterUniqueTogether(
+            name='timeperiod',
+            unique_together={('weekday', 'period', 'validity')},
+        ),
+    ]

aleksis/apps/chronos/models.py

@@ -253,7 +253,7 @@ class TimePeriod(ValidityRangeRelatedExtensibleModel):
         )
 
     class Meta:
-        unique_together = [["weekday", "period"]]
+        unique_together = [["weekday", "period", "validity"]]
         ordering = ["weekday", "period"]
         indexes = [models.Index(fields=["time_start", "time_end"])]
         verbose_name = _("Time period")