Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #17019 from open-craft/jill/hide-auto-advance-if-disabled

Browse Source 
Hides Video Auto Advance from Advanced Settings if disabled
This commit is contained in:
M. Rehan
2017-12-28 15:34:03 +05:00
committed by GitHub
parent 2fcd2830a0 097c0665fc
commit 584dee107e
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cms/djangoapps/models/settings/course_metadata.py
View File

@@ -81,6 +81,10 @@ class CourseMetadata(object):
if not settings.FEATURES.get('ENABLE_VIDEO_UPLOAD_PIPELINE'): if not settings.FEATURES.get('ENABLE_VIDEO_UPLOAD_PIPELINE'):
filtered_list.append('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. # Do not show social sharing url field if the feature is disabled.
if (not hasattr(settings, 'SOCIAL_SHARING_SETTINGS') or if (not hasattr(settings, 'SOCIAL_SHARING_SETTINGS') or
not getattr(settings, 'SOCIAL_SHARING_SETTINGS', {}).get("CUSTOM_COURSE_URLS")): not getattr(settings, 'SOCIAL_SHARING_SETTINGS', {}).get("CUSTOM_COURSE_URLS")):

1
common/test/acceptance/pages/studio/settings_advanced.py
View File

@@ -178,7 +178,6 @@ class AdvancedSettingsPage(CoursePage):
'course_image', 'course_image',
'banner_image', 'banner_image',
'video_thumbnail_image', 'video_thumbnail_image',
'video_auto_advance',
'cosmetic_display_price', 'cosmetic_display_price',
'advertised_start', 'advertised_start',
'announcement', 'announcement',