Skip to content

Commit eb22690

Browse files
committed
Merged in [11891] from rjsparks@nostrum.com:
Modify agenda.json to properly handle meetings that do not have an agenda yet. Fixes ietf-tools#2003. - Legacy-Id: 11896 Note: SVN reference [11891] has been migrated to Git commit 9f40948
2 parents 714781d + 9f40948 commit eb22690

1 file changed

Lines changed: 5 additions & 4 deletions

File tree

ietf/meeting/views.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import pytz
1313
from pyquery import PyQuery
1414
from wsgiref.handlers import format_date_time
15-
from time import mktime
15+
from calendar import timegm
1616

1717
import debug # pyflakes:ignore
1818

@@ -963,18 +963,19 @@ def json_agenda(request, num=None ):
963963
meetinfo.extend(rooms)
964964
meetinfo.extend(parents)
965965
meetinfo.sort(key=lambda x: x['modified'],reverse=True)
966-
last_modified = meetinfo[0]['modified']
966+
last_modified = meetinfo and meetinfo[0]['modified']
967967

968968
tz = pytz.timezone(settings.PRODUCTION_TIMEZONE)
969-
last_modified = tz.localize(last_modified)
970969

971970
for obj in meetinfo:
972971
obj['modified'] = tz.localize(obj['modified']).astimezone(pytz.utc).strftime('%Y-%m-%dT%H:%M:%SZ')
973972

974973
data = {"%s"%num: meetinfo}
975974

976975
response = HttpResponse(json.dumps(data, indent=2), content_type='application/json;charset=%s'%settings.DEFAULT_CHARSET)
977-
response['Last-Modified'] = format_date_time(mktime(last_modified.timetuple()))
976+
if last_modified:
977+
last_modified = tz.localize(last_modified).astimezone(pytz.utc)
978+
response['Last-Modified'] = format_date_time(timegm(last_modified.timetuple()))
978979
return response
979980

980981
def meeting_requests(request, num=None):

0 commit comments

Comments
 (0)