From 097c0665fca26c703169f835679d1950b32e2787 Mon Sep 17 00:00:00 2001 From: Jillian Vogel Date: Sat, 23 Dec 2017 00:34:06 +1030 Subject: [PATCH] Hides Video Auto Advance from Advanced Settings if disabled and fixes affected tests. --- cms/djangoapps/models/settings/course_metadata.py | 4 ++++ common/test/acceptance/pages/studio/settings_advanced.py | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cms/djangoapps/models/settings/course_metadata.py b/cms/djangoapps/models/settings/course_metadata.py index 6184886a13..a437539e6e 100644 --- a/cms/djangoapps/models/settings/course_metadata.py +++ b/cms/djangoapps/models/settings/course_metadata.py @@ -81,6 +81,10 @@ class CourseMetadata(object): if not settings.FEATURES.get('ENABLE_VIDEO_UPLOAD_PIPELINE'): filtered_list.append('video_upload_pipeline') + # Do not show video auto advance if the feature is disabled + if not settings.FEATURES.get('ENABLE_AUTOADVANCE_VIDEOS'): + filtered_list.append('video_auto_advance') + # Do not show social sharing url field if the feature is disabled. if (not hasattr(settings, 'SOCIAL_SHARING_SETTINGS') or not getattr(settings, 'SOCIAL_SHARING_SETTINGS', {}).get("CUSTOM_COURSE_URLS")): diff --git a/common/test/acceptance/pages/studio/settings_advanced.py b/common/test/acceptance/pages/studio/settings_advanced.py index febd176360..769adae1bb 100644 --- a/common/test/acceptance/pages/studio/settings_advanced.py +++ b/common/test/acceptance/pages/studio/settings_advanced.py @@ -178,7 +178,6 @@ class AdvancedSettingsPage(CoursePage): 'course_image', 'banner_image', 'video_thumbnail_image', - 'video_auto_advance', 'cosmetic_display_price', 'advertised_start', 'announcement',