Merge pull request #1360 from appsembler/main

Update from `main` (production)
appsembler · Jul 14, 2023 · 9422f8b · 9422f8b
2 parents cc6dd03 + b6fcd12
commit 9422f8b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/cms/djangoapps/contentstore/views/course.py b/cms/djangoapps/contentstore/views/course.py
@@ -1114,7 +1114,7 @@ def settings_handler(request, course_key_string):
                 'upgrade_deadline': upgrade_deadline,
             }
             if is_prerequisite_courses_enabled():
-                courses, in_process_course_actions = get_courses_accessible_to_user(request)
+                courses, in_process_course_actions = get_courses_accessible_to_user(request, course_module.location.org)
                 # exclude current course from the list of available courses
                 courses = (course for course in courses if course.id != course_key)
                 if courses:

diff --git a/openedx/core/djangoapps/appsembler/settings/settings/common.py b/openedx/core/djangoapps/appsembler/settings/settings/common.py
@@ -89,3 +89,6 @@ def plugin_settings(settings):
 
     # Off by default. See the `site_configuration.tahoe_organization_helpers.py` module.
     settings.FEATURES['TAHOE_SITE_CONFIG_CLIENT_ORGANIZATIONS_SUPPORT'] = False
+
+    # Give a little more time for YT API to load in video_module (default was 1500 ms)
+    settings.YOUTUBE['TEST_TIMEOUT'] = 2500