diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 721912e621695119ba11edb18969de49242309a4..3d24b55b5f332fda533c5577d87c3323de803579 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -14,6 +14,7 @@ Fixed * Register absence form wasn't accessible without direct access to class register. * Printing the full group register failed when a person had no personal notes. +* Data checks reported all Lesson Documentations as being during Holidays if there was no Holiday object. `2.1`_ - 2022-06-25 ------------------- diff --git a/aleksis/apps/alsijil/data_checks.py b/aleksis/apps/alsijil/data_checks.py index 864f019646411443605b0495075ba6acfb47219b..cb056e8cb3728a01c98e110f15e12da629df7ff9 100644 --- a/aleksis/apps/alsijil/data_checks.py +++ b/aleksis/apps/alsijil/data_checks.py @@ -113,7 +113,7 @@ class LessonDocumentationOnHolidaysDataCheck(DataCheck): documentations = LessonDocumentation.objects.not_empty().annotate_date_range() - q = Q() + q = Q(pk__in=[]) for holiday in holidays: q = q | Q(day_end__gte=holiday.date_start, day_start__lte=holiday.date_end) documentations = documentations.filter(q) @@ -147,7 +147,7 @@ class PersonalNoteOnHolidaysDataCheck(DataCheck): personal_notes = PersonalNote.objects.not_empty().annotate_date_range() - q = Q() + q = Q(pk__in=[]) for holiday in holidays: q = q | Q(day_end__gte=holiday.date_start, day_start__lte=holiday.date_end) personal_notes = personal_notes.filter(q)