altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Modify agenda.json to properly handle meetings that do not have an agenda yet. Fixes #2003. Commit ready for merge.

Browse source 
- Legacy-Id: 11891
This commit is contained in:
Robert Sparks 2016-08-30 14:57:28 +00:00
parent b988b86b1a
commit 9f409480c0
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ietf/meeting/views.py
View file

@ -961,7 +961,7 @@ def json_agenda(request, num=None ):
meetinfo.extend(rooms)
meetinfo.extend(parents)
meetinfo.sort(key=lambda x: x['modified'],reverse=True)
last_modified = meetinfo[0]['modified']
last_modified = meetinfo and meetinfo[0]['modified']
tz = pytz.timezone(meeting.time_zone)
for obj in meetinfo:
@ -970,7 +970,8 @@ def json_agenda(request, num=None ):
data = {"%s"%num: meetinfo}
response = HttpResponse(json.dumps(data, indent=2), content_type='application/json;charset=%s'%settings.DEFAULT_CHARSET)
response['Last-Modified'] = format_date_time(mktime(last_modified.timetuple()))
if last_modified:
response['Last-Modified'] = format_date_time(mktime(last_modified.timetuple()))
return response
def meeting_requests(request, num=None):