Include un-merged PR openedx#35544: "suppress errors+warnings when vi…

…deo is used in a content library"

cms/djangoapps/contentstore/views/transcripts_ajax.py

@@ -649,6 +649,9 @@ def _get_item(request, data):
     Returns the item.
     """
     usage_key = UsageKey.from_string(data.get('locator'))
+    if not usage_key.context_key.is_course:
+        # TODO: implement transcript support for learning core / content libraries.
+        raise TranscriptsRequestValidationException(_('Transcripts are not yet supported in content libraries.'))
     # This is placed before has_course_author_access() to validate the location,
     # because has_course_author_access() raises  r if location is invalid.
     item = modulestore().get_item(usage_key)

xmodule/video_block/transcripts_utils.py

@@ -1074,7 +1074,7 @@ def get_transcript_from_learning_core(video_block, language, output_format, tran
     """
     # TODO: Update to use Learning Core data models once static assets support
     # has been added.
-    raise NotImplementedError("Transcripts not supported.")
+    raise NotFoundError("No transcript - transcripts not supported yet by learning core components.")
 
 
 def get_transcript(video, lang=None, output_format=Transcript.SRT, youtube_id=None):

xmodule/video_block/video_block.py

@@ -482,7 +482,7 @@ def get_html(self, view=STUDENT_VIEW, context=None):  # lint-amnesty, pylint: di
             'hide_downloads': is_public_view or is_embed,
             'id': self.location.html_id(),
             'block_id': str(self.location),
-            'course_id': str(self.location.course_key),
+            'course_id': str(self.context_key),
             'video_id': str(self.edx_video_id),
             'user_id': self.get_user_id(),
             'is_embed': is_embed,
@@ -510,8 +510,10 @@ def get_course_video_sharing_override(self):
         """
         Return course video sharing options override or None
         """
+        if not self.context_key.is_course:
+            return False  # Only courses support this feature at all (not libraries)
         try:
-            course = get_course_by_id(self.course_id)
+            course = get_course_by_id(self.context_key)
             return getattr(course, 'video_sharing_options', None)
 
         # In case the course / modulestore does something weird
@@ -523,11 +525,13 @@ def is_public_sharing_enabled(self):
         """
         Is public sharing enabled for this video?
         """
+        if not self.context_key.is_course:
+            return False  # Only courses support this feature at all (not libraries)
         try:
             # Video share feature must be enabled for sharing settings to take effect
-            feature_enabled = PUBLIC_VIDEO_SHARE.is_enabled(self.location.course_key)
+            feature_enabled = PUBLIC_VIDEO_SHARE.is_enabled(self.context_key)
         except Exception as err:  # pylint: disable=broad-except
-            log.exception(f"Error retrieving course for course ID: {self.location.course_key}")
+            log.exception(f"Error retrieving course for course ID: {self.context_key}")
             return False
         if not feature_enabled:
             return False
@@ -552,11 +556,13 @@ def is_transcript_feedback_enabled(self):
         """
         Is transcript feedback enabled for this video?
         """
+        if not self.context_key.is_course:
+            return False  # Only courses support this feature at all (not libraries)
         try:
             # Video transcript feedback must be enabled in order to show the widget
-            feature_enabled = TRANSCRIPT_FEEDBACK.is_enabled(self.location.course_key)
+            feature_enabled = TRANSCRIPT_FEEDBACK.is_enabled(self.context_key)
         except Exception as err:  # pylint: disable=broad-except
-            log.exception(f"Error retrieving course for course ID: {self.location.course_key}")
+            log.exception(f"Error retrieving course for course ID: {self.context_key}")
             return False
         return feature_enabled