Skip to content
Snippets Groups Projects
Verified Commit e028f57d authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Reformat

parent e1695a38
No related branches found
No related tags found
1 merge request!301New data model based on calendar events
Pipeline #171695 failed
...@@ -905,7 +905,8 @@ class LessonEventQuerySet(PolymorphicQuerySet): ...@@ -905,7 +905,8 @@ class LessonEventQuerySet(PolymorphicQuerySet):
def related_to_person(self, person: Union[int, Person]): def related_to_person(self, person: Union[int, Person]):
amended = self.filter( 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) ).values_list("amended_by__pk", flat=True)
return self.filter( return self.filter(
Q(teachers=person) | Q(groups__members=person) | Q(groups__owners=person) Q(teachers=person) | Q(groups__members=person) | Q(groups__owners=person)
......
...@@ -8,7 +8,7 @@ from itertools import chain ...@@ -8,7 +8,7 @@ from itertools import chain
from typing import Any from typing import Any
from django.contrib.contenttypes.models import ContentType 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.core.validators import MinValueValidator
from django.db import models from django.db import models
from django.db.models import Max, Min, Q from django.db.models import Max, Min, Q
...@@ -1535,7 +1535,7 @@ class LessonEvent(CalendarEvent): ...@@ -1535,7 +1535,7 @@ class LessonEvent(CalendarEvent):
def get_objects(cls, request, params=None) -> Iterable: def get_objects(cls, request, params=None) -> Iterable:
"""Return all objects that should be included in the calendar.""" """Return all objects that should be included in the calendar."""
objs = super().get_objects(request, params).not_instance_of(SupervisionEvent) objs = super().get_objects(request, params).not_instance_of(SupervisionEvent)
if not has_person(request.user): if not has_person(request.user):
raise PermissionDenied() raise PermissionDenied()
......
...@@ -46,14 +46,12 @@ class TimetableObjectType(graphene.ObjectType): ...@@ -46,14 +46,12 @@ class TimetableObjectType(graphene.ObjectType):
def resolve_id(root, info, **kwargs): def resolve_id(root, info, **kwargs):
return f"{root.type.value}-{root.id}" return f"{root.type.value}-{root.id}"
class LessonEventType(DjangoObjectType): class LessonEventType(DjangoObjectType):
class Meta: class Meta:
model = LessonEvent model = LessonEvent
fields = ( fields = ("id",)
"id",
)
filter_fields = { filter_fields = {
"id": ["exact", "lte", "gte"], "id": ["exact", "lte", "gte"],
} }
......
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