Skip to content
Snippets Groups Projects
Commit 58101587 authored by Roang's avatar Roang
Browse files

Merge branch 'fix/366' into 'develop'

Fix event detail lookup

See merge request hub/hub!679
parents f213234b 8fa33406
Branches
Tags v31.0.4
No related merge requests found
from rest_framework import generics
from core.models.events import Event from core.models.events import Event
from django.shortcuts import get_object_or_404
from rest_framework import generics
from ..serializers import EventSerializer from ..serializers import EventSerializer
from .mixins import ConferenceSlugMixin from .mixins import ConferenceSlugMixin
...@@ -10,12 +10,14 @@ class EventList(ConferenceSlugMixin, generics.ListAPIView): ...@@ -10,12 +10,14 @@ class EventList(ConferenceSlugMixin, generics.ListAPIView):
serializer_class = EventSerializer serializer_class = EventSerializer
def get_queryset(self, **kwargs): def get_queryset(self, **kwargs):
return Event.objects.filter(conference=self.conference).order_by('name') return Event.objects.filter(conference=self.conference).order_by("name")
class EventDetail(ConferenceSlugMixin, generics.RetrieveAPIView): class EventDetail(ConferenceSlugMixin, generics.RetrieveAPIView):
serializer_class = EventSerializer serializer_class = EventSerializer
def get_object(self, **kwargs): def get_object(self, **kwargs):
event_id = self.request.resolver_match.kwargs['pk'] event_id = self.request.resolver_match.kwargs["pk"]
return Event.objects.conference_accessible(conference=self.conference).get(pk=event_id) return get_object_or_404(
Event.objects.conference_accessible(conference=self.conference), pk=event_id
)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment