Skip to content
Snippets Groups Projects
Commit e63dcd42 authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch '179-lesson-documentations-are-not-unique-ticket-75177' into 'master'

Resolve "Lesson documentations are not unique [Ticket#75177]"

Closes #179

See merge request !225
parents 60e72e79 d193a0e8
No related branches found
No related tags found
1 merge request!225Resolve "Lesson documentations are not unique [Ticket#75177]"
Pipeline #32085 failed
......@@ -13,6 +13,7 @@ Fixed
~~~~~
* Fix problems with displaying dates for events in the week and lesson view.
* Unique constraint on lesson documentations and personal notes did not work and caused racey duplicates.
`2.0rc5`_ - 2021-08-12
----------------------
......
# Generated by Django 3.2.3 on 2021-08-20 12:38
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('alsijil', '0013_fix_uniqueness_per_site'),
]
operations = [
migrations.RemoveConstraint(
model_name='lessondocumentation',
name='unique_documentation_per_object',
),
migrations.AddConstraint(
model_name='lessondocumentation',
constraint=models.UniqueConstraint(fields=('week', 'year', 'lesson_period'), name='unique_documentation_per_lp'),
),
migrations.AddConstraint(
model_name='lessondocumentation',
constraint=models.UniqueConstraint(fields=('week', 'year', 'event'), name='unique_documentation_per_ev'),
),
migrations.AddConstraint(
model_name='lessondocumentation',
constraint=models.UniqueConstraint(fields=('week', 'year', 'extra_lesson'), name='unique_documentation_per_el'),
),
]
# Generated by Django 3.2.4 on 2021-08-29 13:31
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('alsijil', '0014_fix_unique_lesson_documentation'),
]
operations = [
migrations.RemoveConstraint(
model_name='personalnote',
name='unique_personal_note_per_object',
),
migrations.AddConstraint(
model_name='personalnote',
constraint=models.UniqueConstraint(fields=('week', 'year', 'lesson_period', 'person'), name='unique_note_per_lp'),
),
migrations.AddConstraint(
model_name='personalnote',
constraint=models.UniqueConstraint(fields=('week', 'year', 'event', 'person'), name='unique_note_per_ev'),
),
migrations.AddConstraint(
model_name='personalnote',
constraint=models.UniqueConstraint(fields=('week', 'year', 'extra_lesson', 'person'), name='unique_note_per_el'),
),
]
......@@ -283,8 +283,13 @@ class PersonalNote(RegisterObjectRelatedMixin, ExtensibleModel):
check=lesson_related_constraint_q, name="one_relation_only_personal_note"
),
models.UniqueConstraint(
fields=("lesson_period", "week", "year", "event", "extra_lesson"),
name="unique_personal_note_per_object",
fields=("week", "year", "lesson_period", "person"), name="unique_note_per_lp",
),
models.UniqueConstraint(
fields=("week", "year", "event", "person"), name="unique_note_per_ev",
),
models.UniqueConstraint(
fields=("week", "year", "extra_lesson", "person"), name="unique_note_per_el",
),
]
......@@ -373,8 +378,13 @@ class LessonDocumentation(RegisterObjectRelatedMixin, ExtensibleModel):
check=lesson_related_constraint_q, name="one_relation_only_lesson_documentation",
),
models.UniqueConstraint(
fields=("lesson_period", "week", "year", "event", "extra_lesson"),
name="unique_documentation_per_object",
fields=("week", "year", "lesson_period"), name="unique_documentation_per_lp",
),
models.UniqueConstraint(
fields=("week", "year", "event"), name="unique_documentation_per_ev",
),
models.UniqueConstraint(
fields=("week", "year", "extra_lesson"), name="unique_documentation_per_el",
),
]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment