diff options
| author | Christian Pointner <equinox@helsinki.at> | 2016-04-15 19:40:48 (GMT) |
|---|---|---|
| committer | Christian Pointner <equinox@helsinki.at> | 2016-04-15 19:40:48 (GMT) |
| commit | 7becbd5338dd1716ea314f77c977e0a9b22a758e (patch) | |
| tree | a22774470ca7e5447644dc4869ca797adae50185 | |
| parent | 17f110df8c14ea258d9227d08471a4a82bfa4657 (diff) | |
| parent | f49a48b8e1d891d0591473285f13e307dbc6fb9d (diff) | |
Merge branch 'master' into stable
| -rw-r--r-- | program/views.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/program/views.py b/program/views.py index 29253c0..5218ce7 100644 --- a/program/views.py +++ b/program/views.py @@ -198,11 +198,11 @@ def json_day_schedule(request, year=None, month=None, day=None): timeslots = TimeSlot.objects.get_24h_timeslots(today) schedule = [] for ts in timeslots: - entry = { 'start': ts.start.strftime('%H:%M:%S'), 'title': ts.programslot.show.name, 'id': -1 } + entry = { 'start': ts.start.strftime('%H:%M:%S'), 'title': ts.programslot.show.name, 'id': ts.programslot.show.id, 'automation-id': -1 } if ts.programslot.automation_id: - entry['id'] = ts.programslot.automation_id + entry['automation-id'] = ts.programslot.automation_id elif ts.programslot.show.automation_id: - entry['id'] = ts.programslot.show.automation_id + entry['automation-id'] = ts.programslot.show.automation_id schedule.append(entry) |