Merged in [15982] from rjsparks@nostrum.com:
Add session.short to the output from meeting/agenda.json when it is available.
- Legacy-Id: 15983
Note: SVN reference [15982] has been migrated to Git commit ca8c3031ea
This commit is contained in:
commit
bbb873c9d4
|
@ -942,10 +942,10 @@ def json_agenda(request, num=None ):
|
|||
parent_acronyms.add(asgn.session.historic_group.historic_parent.acronym)
|
||||
if asgn.session.name:
|
||||
sessdict['name'] = asgn.session.name
|
||||
elif asgn.session.short:
|
||||
sessdict['name'] = asgn.session.short
|
||||
else:
|
||||
sessdict['name'] = asgn.session.historic_group.name
|
||||
if asgn.session.short:
|
||||
sessdict['short'] = asgn.session.short
|
||||
sessdict['start'] = asgn.timeslot.utc_start_time().strftime("%Y-%m-%dT%H:%M:%SZ")
|
||||
sessdict['duration'] = str(asgn.timeslot.duration)
|
||||
sessdict['location'] = asgn.room_name
|
||||
|
|
Loading…
Reference in a new issue