From dd0afded325b68f70260a5fb1c920b1326ac08ba Mon Sep 17 00:00:00 2001
From: Ernesto Rico Schmidt <ernesto@helsinki.at>
Date: Mon, 24 Jan 2022 17:34:48 -0400
Subject: [PATCH] Remove automation_id from json_day_schedule and json_playout
views and APIScheduleViewSet
---
program/views.py | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/program/views.py b/program/views.py
index ae1bf7a7..a6101bc5 100644
--- a/program/views.py
+++ b/program/views.py
@@ -54,12 +54,8 @@ def json_day_schedule(request, year=None, month=None, day=None):
'end': ts.end.strftime('%Y-%m-%d_%H:%M:%S'),
'title': ts.show.name,
'id': ts.show.id,
- 'automation-id': -1
}
- if ts.schedule.automation_id:
- entry['automation-id'] = ts.schedule.automation_id
-
schedule.append(entry)
return HttpResponse(json.dumps(schedule, ensure_ascii=False).encode('utf8'),
@@ -118,7 +114,6 @@ def json_playout(request):
'start': ts.start.strftime('%Y-%m-%dT%H:%M:%S'),
'end': ts.end.strftime('%Y-%m-%dT%H:%M:%S'),
'title': ts.show.name + is_repetition, # For JS Calendar
- 'automation-id': -1,
'schedule_id': ts.schedule.id,
'is_repetition': ts.is_repetition,
'playlist_id': ts.playlist_id,
@@ -137,9 +132,6 @@ def json_playout(request):
'className': classname,
}
- if ts.schedule.automation_id:
- entry['automation-id'] = ts.schedule.automation_id
-
schedule.append(entry)
return HttpResponse(json.dumps(schedule, ensure_ascii=False).encode('utf8'),
@@ -468,7 +460,7 @@ class APIScheduleViewSet(viewsets.ModelViewSet):
return Response(status=status.HTTP_400_BAD_REQUEST)
# If we're updating the default playlist id
- # TODO: If nothing else than default_playlist_id, automation_id or is_repetition changed -> just save and don't do anything
+ # TODO: If nothing else than default_playlist_id, or is_repetition changed -> just save and don't do anything
new_schedule = request.data.get('schedule')
if 'default_playlist_id' in new_schedule:
schedule = get_object_or_404(Schedule, pk=pk, show=show_pk)
--
GitLab