diff --git a/program/views.py b/program/views.py index 0ffcb03fee3cac3a20777b3b706b3b9756fbaad2..78be1f363f2b64718c0ddad005c7e8faa6d2e6fe 100644 --- a/program/views.py +++ b/program/views.py @@ -182,12 +182,9 @@ def json_playout(request): "show_type": type_.name, "show_categories": categories, "show_topics": topics, - # TODO: replace `show_musicfocus` with `show_music_focus` when engine is updated - "show_musicfocus": music_focus, + "show_music_focus": music_focus, "show_languages": languages, - # TODO: replace `show_fundingcategory` with `show_funding_category` when engine is - # updated - "show_fundingcategory": funding_category.name, + "show_funding_category": funding_category.name, "memo": ts.memo, "className": classname, } @@ -400,7 +397,7 @@ class APIShowViewSet(DisabledObjectPermissionCheckMixin, viewsets.ModelViewSet): * 'This change on the timeslot is not allowed.' When adding: There was a change in the schedule's data during conflict resolution. - When updating: Fields 'start', 'end', 'byweekday' or 'rrule' have changed, + When updating: Fields 'start', 'end', 'by_weekday' or 'rrule' have changed, which is not allowed. * 'No solution given': No solution was provided for the conflict in `solutions`. Provide a value of `solution_choices`.