Skip to content

fix: Server error from api_get_session_materials() #6025

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rjsparks merged 1 commit into from
Jul 22, 2023
+13 −2
Merged

fix: Server error from api_get_session_materials() #6025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions ietf/api/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,6 +725,15 @@ def test_api_appauth(self):
self.assertEqual(r.status_code, 200)
jsondata = r.json()
self.assertEqual(jsondata['success'], True)

def test_api_get_session_matherials_no_agenda_meeting_url(self):
meeting = MeetingFactory(type_id='ietf')
session = SessionFactory(meeting=meeting)
url = urlreverse('ietf.meeting.views.api_get_session_materials', kwargs={'session_id': session.pk})
r = self.client.get(url)
self.assertEqual(r.status_code, 200)



class DirectAuthApiTests(TestCase):

Expand Down
6 changes: 4 additions & 2 deletions ietf/meeting/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1704,9 +1704,11 @@ def api_get_session_materials (request, session_id=None):
})
else:
pass # no action available if it's past cutoff


agenda = session.agenda()
agenda_url = agenda.get_href() if agenda is not None else None
return JsonResponse({
"url": session.agenda().get_href(),
"url": agenda_url,
"slides": {
"decks": list(map(agenda_extract_slide, session.slides())),
"actions": slides_actions,
Expand Down