diff --git a/aleksis/apps/chronos/managers.py b/aleksis/apps/chronos/managers.py index a2193046c1c3d86a3a68642b9669ba1d6fc34322..fae25d1817462aa3f0fd0babf619bf480cb65320 100644 --- a/aleksis/apps/chronos/managers.py +++ b/aleksis/apps/chronos/managers.py @@ -905,7 +905,8 @@ class LessonEventQuerySet(PolymorphicQuerySet): def related_to_person(self, person: Union[int, Person]): amended = self.filter( - Q(amended_by__isnull=False) & (Q(teachers=person) | Q(groups__members=person) | Q(groups__owners=person)) + Q(amended_by__isnull=False) + & (Q(teachers=person) | Q(groups__members=person) | Q(groups__owners=person)) ).values_list("amended_by__pk", flat=True) return self.filter( Q(teachers=person) | Q(groups__members=person) | Q(groups__owners=person) diff --git a/aleksis/apps/chronos/models.py b/aleksis/apps/chronos/models.py index 944095e713fd9fc8498af60b97cc3e5d3748372f..5bf42890ef4833a8fddb086bc7a1f5530dde4007 100644 --- a/aleksis/apps/chronos/models.py +++ b/aleksis/apps/chronos/models.py @@ -8,7 +8,7 @@ from itertools import chain from typing import Any from django.contrib.contenttypes.models import ContentType -from django.core.exceptions import ValidationError, PermissionDenied +from django.core.exceptions import PermissionDenied, ValidationError from django.core.validators import MinValueValidator from django.db import models from django.db.models import Max, Min, Q @@ -1535,7 +1535,7 @@ class LessonEvent(CalendarEvent): def get_objects(cls, request, params=None) -> Iterable: """Return all objects that should be included in the calendar.""" objs = super().get_objects(request, params).not_instance_of(SupervisionEvent) - + if not has_person(request.user): raise PermissionDenied() diff --git a/aleksis/apps/chronos/schema/__init__.py b/aleksis/apps/chronos/schema/__init__.py index 3986fa922160fa33772d6e1cb7e152c59066c861..b746fc21e8344af3367d53d5d0d7abfff79cd708 100644 --- a/aleksis/apps/chronos/schema/__init__.py +++ b/aleksis/apps/chronos/schema/__init__.py @@ -46,14 +46,12 @@ class TimetableObjectType(graphene.ObjectType): def resolve_id(root, info, **kwargs): return f"{root.type.value}-{root.id}" - - + + class LessonEventType(DjangoObjectType): class Meta: model = LessonEvent - fields = ( - "id", - ) + fields = ("id",) filter_fields = { "id": ["exact", "lte", "gte"], }