Commit 9351600c by M. Rehan Committed by GitHub

Merge pull request #14594 from edx/mrehan/duplicate-video-id-in-basic-tab

TNL-6489 – duplicate video id in basic tab
parents 8688edaf f064e991
...@@ -667,6 +667,7 @@ class VideoDescriptor(VideoFields, VideoTranscriptsMixin, VideoStudioViewHandler ...@@ -667,6 +667,7 @@ class VideoDescriptor(VideoFields, VideoTranscriptsMixin, VideoStudioViewHandler
display_name = metadata_fields['display_name'] display_name = metadata_fields['display_name']
video_url = metadata_fields['html5_sources'] video_url = metadata_fields['html5_sources']
video_id = metadata_fields['edx_video_id']
youtube_id_1_0 = metadata_fields['youtube_id_1_0'] youtube_id_1_0 = metadata_fields['youtube_id_1_0']
def get_youtube_link(video_id): def get_youtube_link(video_id):
...@@ -698,7 +699,8 @@ class VideoDescriptor(VideoFields, VideoTranscriptsMixin, VideoStudioViewHandler ...@@ -698,7 +699,8 @@ class VideoDescriptor(VideoFields, VideoTranscriptsMixin, VideoStudioViewHandler
metadata = { metadata = {
'display_name': display_name, 'display_name': display_name,
'video_url': video_url 'video_url': video_url,
'edx_video_id': video_id
} }
_context.update({'transcripts_basic_tab_metadata': metadata}) _context.update({'transcripts_basic_tab_metadata': metadata})
......
...@@ -55,6 +55,7 @@ DEFAULT_SETTINGS = [ ...@@ -55,6 +55,7 @@ DEFAULT_SETTINGS = [
# basic # basic
[DISPLAY_NAME, 'Video', False], [DISPLAY_NAME, 'Video', False],
['Default Video URL', 'https://www.youtube.com/watch?v=3_yD_cEKoCk, , ', False], ['Default Video URL', 'https://www.youtube.com/watch?v=3_yD_cEKoCk, , ', False],
['Video ID', '', False],
# advanced # advanced
[DISPLAY_NAME, 'Video', False], [DISPLAY_NAME, 'Video', False],
......
...@@ -1247,6 +1247,12 @@ class VideoDescriptorTest(TestCase, VideoDescriptorTestBase): ...@@ -1247,6 +1247,12 @@ class VideoDescriptorTest(TestCase, VideoDescriptorTestBase):
rendered_context = self.descriptor.get_context() rendered_context = self.descriptor.get_context()
self.assertListEqual(rendered_context['tabs'], correct_tabs) self.assertListEqual(rendered_context['tabs'], correct_tabs)
# Assert that the Video ID field is present in basic tab metadata context.
self.assertEqual(
rendered_context['transcripts_basic_tab_metadata']['edx_video_id'],
self.descriptor.editable_metadata_fields['edx_video_id']
)
def test_export_val_data(self): def test_export_val_data(self):
self.descriptor.edx_video_id = 'test_edx_video_id' self.descriptor.edx_video_id = 'test_edx_video_id'
create_profile('mobile') create_profile('mobile')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment