diff --git a/src/agenda_culturel/views.py b/src/agenda_culturel/views.py index e692265..f10d1c7 100644 --- a/src/agenda_culturel/views.py +++ b/src/agenda_culturel/views.py @@ -1976,7 +1976,7 @@ class PlaceDetailView(ListView): Q(other_versions__isnull=True) | Q(other_versions__representative=F('pk')) | Q(other_versions__representative__isnull=True)).filter(start_day__gte=datetime.now()).order_by("start_day") - + def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) @@ -2181,7 +2181,10 @@ class OrganisationDetailView(ListView): def get_queryset(self): self.organisation = Organisation.objects.filter(pk=self.kwargs["pk"]).prefetch_related('organised_events').first() - return self.organisation.organised_events.filter(start_day__gte=datetime.now()).order_by("start_day") + return get_event_qs(self.request).filter(organisers__in=[self.kwargs["pk"]]).filter( + Q(other_versions__isnull=True) | + Q(other_versions__representative=F('pk')) | + Q(other_versions__representative__isnull=True)).filter(start_day__gte=datetime.now()).order_by("start_day") def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) @@ -2193,7 +2196,10 @@ class OrganisationDetailViewPast(OrganisationDetailView): def get_queryset(self): self.organisation = Organisation.objects.filter(pk=self.kwargs["pk"]).prefetch_related('organised_events').first() self.past = True - return self.organisation.organised_events.filter(start_day__lte=datetime.now()).order_by("-start_day") + return get_event_qs(self.request).filter(organisers__in=[self.kwargs["pk"]]).filter( + Q(other_versions__isnull=True) | + Q(other_versions__representative=F('pk')) | + Q(other_versions__representative__isnull=True)).filter(start_day__lte=datetime.now()).order_by("-start_day") def get_context_data(self, **kwargs):