From 0577b9d8b961c72cd74f39030d43ea7c4eff8fe6 Mon Sep 17 00:00:00 2001 From: Oleg Marshev Date: Fri, 8 Aug 2014 17:17:27 +0300 Subject: [PATCH] Allow turning off Video CDN in Studio. BLD-1207 --- CHANGELOG.rst | 2 ++ cms/djangoapps/models/settings/course_metadata.py | 1 - common/lib/xmodule/xmodule/modulestore/inheritance.py | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 25d7fa9c36..4ce1290b66 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -5,6 +5,8 @@ These are notable changes in edx-platform. This is a rolling list of changes, in roughly chronological order, most recent first. Add your entries at or near the top. Include a label indicating the component affected. +Blades: Course teams can turn off Chinese Caching from Studio. BLD-1207 + LMS: Instructors can request and see content of previous bulk emails sent in the instructor dashboard. Studio: New course outline and unit/container pages with revised publishing model. STUD-1790 (part 1) diff --git a/cms/djangoapps/models/settings/course_metadata.py b/cms/djangoapps/models/settings/course_metadata.py index 07a1d6b116..09d87a2b21 100644 --- a/cms/djangoapps/models/settings/course_metadata.py +++ b/cms/djangoapps/models/settings/course_metadata.py @@ -27,7 +27,6 @@ class CourseMetadata(object): 'user_partitions', 'name', # from xblock 'tags', # from xblock - 'video_speed_optimizations', 'visible_to_staff_only' ] diff --git a/common/lib/xmodule/xmodule/modulestore/inheritance.py b/common/lib/xmodule/xmodule/modulestore/inheritance.py index 4316655a7d..d305c6641c 100644 --- a/common/lib/xmodule/xmodule/modulestore/inheritance.py +++ b/common/lib/xmodule/xmodule/modulestore/inheritance.py @@ -148,7 +148,8 @@ class InheritanceMixin(XBlockMixin): scope=Scope.settings ) video_speed_optimizations = Boolean( - help="Enable Video CDN.", + display_name=_("Enable video caching system"), + help=_("Enter true or false. If true, video caching will be used for HTML5 videos."), default=True, scope=Scope.settings )