setop/agenda_culturel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

On supprime les événements non publics de la vue par organisateur

Browse Source
This commit is contained in:
Jean-Marie Favreau 2025-02-27 00:18:13 +01:00
parent f988b53521
commit 0bb89a8177
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/agenda_culturel/views.py
View File

@ -1976,7 +1976,7 @@ class PlaceDetailView(ListView):
Q(other_versions__isnull=True) | Q(other_versions__isnull=True) |
Q(other_versions__representative=F('pk')) | Q(other_versions__representative=F('pk')) |
Q(other_versions__representative__isnull=True)).filter(start_day__gte=datetime.now()).order_by("start_day") Q(other_versions__representative__isnull=True)).filter(start_day__gte=datetime.now()).order_by("start_day")
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs) context = super().get_context_data(**kwargs)
@ -2181,7 +2181,10 @@ class OrganisationDetailView(ListView):
def get_queryset(self): def get_queryset(self):
self.organisation = Organisation.objects.filter(pk=self.kwargs["pk"]).prefetch_related('organised_events').first() 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): def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs) context = super().get_context_data(**kwargs)
@ -2193,7 +2196,10 @@ class OrganisationDetailViewPast(OrganisationDetailView):
def get_queryset(self): def get_queryset(self):
self.organisation = Organisation.objects.filter(pk=self.kwargs["pk"]).prefetch_related('organised_events').first() self.organisation = Organisation.objects.filter(pk=self.kwargs["pk"]).prefetch_related('organised_events').first()
self.past = True 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): def get_context_data(self, **kwargs):