Merge branch 'main' of ssh://gitlab.servus.at:22022/aura/steering

program/serializers.py

@@ -822,15 +822,14 @@ class ScheduleInRequestSerializer(ScheduleSerializer):
 
 
 class CollisionSerializer(serializers.Serializer):
-    id = serializers.IntegerField()
     start = serializers.DateTimeField()
     end = serializers.DateTimeField()
     playlist_id = serializers.IntegerField(allow_null=True)
     show_id = serializers.IntegerField()
     show_name = serializers.CharField()
-    repetition_of_id = serializers.IntegerField(allow_null=True)
     schedule_id = serializers.IntegerField()
     memo = serializers.CharField()
+    timeslot_id = serializers.IntegerField()
     note_id = serializers.IntegerField(allow_null=True)