Merge branch 'fix/bugs' into 'master'

Fix some bugs

See merge request !353

aleksis/apps/chronos/managers.py

@@ -878,7 +878,7 @@ class LessonEventQuerySet(PolymorphicQuerySet):
 
     def for_participant(self, person: Union[int, Person]) -> "LessonEventQuerySet":
         """Get all lesson events the person participates in (including amends)."""
-        amended = self.filter(Q(amended_by__isnull=False) | Q(groups__members=person)).values_list(
+        amended = self.filter(Q(amended_by__isnull=False) & Q(groups__members=person)).values_list(
             "amended_by__pk", flat=True
         )
         return self.filter(Q(groups__members=person) | Q(pk__in=amended)).distinct()

aleksis/apps/chronos/models.py

@@ -1533,7 +1533,7 @@ class LessonEvent(CalendarEvent):
             .get_objects(request, params)
             .not_instance_of(SupervisionEvent)
             .select_related("subject", "course")
-            .prefetch_related("groups", "teachers", "rooms")
+            .prefetch_related("groups", "teachers", "rooms", "groups__members")
         )
 
         if request and not has_person(request.user):