|
@@ -97,6 +97,8 @@ def get_global_data():
|
|
|
if 'startdate' not in data:
|
|
|
logging.error("Missing startdate in global data")
|
|
|
data['startdate'] = datetime.datetime.now()
|
|
|
+ if 'rooms' not in data:
|
|
|
+ data['rooms'] = {}
|
|
|
return data
|
|
|
|
|
|
|
|
@@ -143,6 +145,9 @@ def get_talk_data(talkname):
|
|
|
data['needs'] = []
|
|
|
if 'room' not in data:
|
|
|
logging.warn("Talk <{}> has no `room` field".format(talkname))
|
|
|
+ else:
|
|
|
+ if data['room'] in get_global_data()['rooms']:
|
|
|
+ data['room'] = get_global_data()['rooms'][data['room']]
|
|
|
if 'time' not in data or 'day' not in data:
|
|
|
logging.warn("Talk <{}> has no `time` or `day`".format(talkname))
|
|
|
if 'time' in data:
|
|
@@ -305,7 +310,7 @@ class TalkGridDirective(Directive):
|
|
|
rooms.add(r)
|
|
|
else:
|
|
|
rooms.add(t['room'])
|
|
|
- rooms = list(sorted(rooms))
|
|
|
+ rooms = list(sorted(rooms)) # TODO: ordina in base a qualcosa nel meta.yaml globale
|
|
|
# room=* is not a real room.
|
|
|
# Remove it unless that day only has special rooms
|
|
|
if '*' in rooms and len(rooms) > 1:
|