Skip to content

Commit

Permalink
Merge branch 'master' into iamsobanjaved/django-42
Browse files Browse the repository at this point in the history
  • Loading branch information
awais786 authored Dec 22, 2023
2 parents b7ad037 + 3c1b81c commit 451637c
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 8 deletions.
4 changes: 0 additions & 4 deletions cms/djangoapps/contentstore/rest_api/v1/serializers/videos.py
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,6 @@ class VideoModelSerializer(serializers.Serializer):
transcripts = serializers.ListField(
child=serializers.CharField()
)
usage_locations = serializers.ListField(
child=serializers.DictField()
)


class VideoActiveTranscriptPreferencesSerializer(serializers.Serializer):
Expand Down Expand Up @@ -99,7 +96,6 @@ class CourseVideosSerializer(serializers.Serializer):
child=serializers.CharField()
)
)
# transcript_available_languages = serializers.BooleanField(required=False, allow_null=True)
video_transcript_settings = VideoTranscriptSettingsSerializer()
pagination_context = serializers.DictField(
child=serializers.CharField(),
Expand Down
1 change: 0 additions & 1 deletion cms/djangoapps/contentstore/video_storage_handlers.py
Original file line number Diff line number Diff line change
Expand Up @@ -685,7 +685,6 @@ def _get_values(video, course):
Get data for predefined video attributes.
"""
values = {}
values["usage_locations"] = get_video_usage_path(course.id, video["edx_video_id"])['usage_locations']
for attr in attrs:
if attr == 'courses':
current_course = [c for c in video['courses'] if course_id in c]
Expand Down
5 changes: 2 additions & 3 deletions cms/djangoapps/contentstore/views/tests/test_videos.py
Original file line number Diff line number Diff line change
Expand Up @@ -374,7 +374,6 @@ def test_get_json(self):
'transcription_status',
'transcript_urls',
'error_description',
'usage_locations'
}
)
dateutil.parser.parse(response_video['created'])
Expand All @@ -391,7 +390,7 @@ def test_get_json(self):
'edx_video_id', 'client_video_id', 'created', 'duration',
'status', 'course_video_image_url', 'file_size', 'download_link',
'transcripts', 'transcription_status', 'transcript_urls',
'error_description', 'usage_locations'
'error_description'
],
[
{
Expand All @@ -409,7 +408,7 @@ def test_get_json(self):
'edx_video_id', 'client_video_id', 'created', 'duration',
'status', 'course_video_image_url', 'file_size', 'download_link',
'transcripts', 'transcription_status', 'transcript_urls',
'error_description', 'usage_locations'
'error_description'
],
[
{
Expand Down

0 comments on commit 451637c

Please sign in to comment.