diff --git a/src/agenda_culturel/views.py b/src/agenda_culturel/views.py index f1ac84c..e692265 100644 --- a/src/agenda_culturel/views.py +++ b/src/agenda_culturel/views.py @@ -446,7 +446,7 @@ class EventModerateView( def is_moderation_from_date(self): return "m" in self.kwargs and "y" in self.kwargs and "d" in self.kwargs - def get_next_event(start_day, start_time): + def get_next_event(start_day, start_time, opk): # select non moderated events qs = Event.objects.filter(moderated_date__isnull=True) @@ -454,7 +454,7 @@ class EventModerateView( if start_time: qs = qs.filter(Q(start_day__gt=start_day)|(Q(start_day=start_day) & (Q(start_time__isnull=True)|Q(start_time__gt=start_time)))) else: - qs = qs.filter(Q(start_day__gte=start_day) & ~Q(pk=self.pk)) + qs = qs.filter(Q(start_day__gte=start_day) & ~Q(pk=opk)) # get only possibly representative events qs = qs.filter( @@ -479,7 +479,7 @@ class EventModerateView( def get_object(self, queryset=None): if self.is_starting_moderation(): now = datetime.now() - event = EventModerateView.get_next_event(now.date(), now.time()) + event = EventModerateView.get_next_event(now.date(), now.time(), None) else: event = super().get_object(queryset) if event.status == Event.STATUS.DRAFT: @@ -529,7 +529,7 @@ def moderate_event_next(request, pk): start_day = obj.start_day start_time = obj.start_time - next_obj = EventModerateView.get_next_event(start_day, start_time) + next_obj = EventModerateView.get_next_event(start_day, start_time, pk) if next_obj is None: return render( request, @@ -543,7 +543,7 @@ def moderate_event_next(request, pk): @permission_required("agenda_culturel.change_event") def moderate_from_date(request, y, m, d): d = date(y, m, d) - obj = EventModerateView.get_next_event(d, None) + obj = EventModerateView.get_next_event(d, None, None) return HttpResponseRedirect(reverse_lazy("moderate_event", args=[obj.pk]))