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

Merge branch 'fix/api_room_schedule' into 'develop'

fixed room schedule api endpoint

See merge request hub/hub!677
parents b5230c3c 48abb559
Branches
No related tags found
No related merge requests found
...@@ -69,11 +69,11 @@ class ConferenceSchedule(BaseScheduleView): ...@@ -69,11 +69,11 @@ class ConferenceSchedule(BaseScheduleView):
class AssemblySchedule(BaseScheduleView): class AssemblySchedule(BaseScheduleView):
def get_cache_id(self): def get_cache_id(self):
assembly_id = self.request.resolver_match.get('assembly') assembly_id = self.request.resolver_match.kwargs.get('assembly')
return f'assembly_{assembly_id}' return f'assembly_{assembly_id}'
def get_events(self): def get_events(self):
assembly_id = self.request.resolver_match.get('assembly') assembly_id = self.request.resolver_match.kwargs.get('assembly')
return Event.objects \ return Event.objects \
.conference_accessible(conference=self.conference) \ .conference_accessible(conference=self.conference) \
.select_related('track', 'room') \ .select_related('track', 'room') \
...@@ -83,11 +83,11 @@ class AssemblySchedule(BaseScheduleView): ...@@ -83,11 +83,11 @@ class AssemblySchedule(BaseScheduleView):
class RoomSchedule(BaseScheduleView): class RoomSchedule(BaseScheduleView):
def get_cache_id(self): def get_cache_id(self):
room_id = self.request.resolver_match.get('pk') room_id = self.request.resolver_match.kwargs.get('pk')
return f'room-{room_id}' return f'room-{room_id}'
def get_events(self): def get_events(self):
room_id = self.request.resolver_match.get('pk') room_id = self.request.resolver_match.kwargs.get('pk')
return Event.objects \ return Event.objects \
.conference_accessible(conference=self.conference) \ .conference_accessible(conference=self.conference) \
.filter(room_id=room_id) \ .filter(room_id=room_id) \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment