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

Merge pull request #25885 from regisb/regisb/fix-deprecated-waffle-usage

Browse Source 
[BD-21] Fix deprecated waffle usage
This commit is contained in:
Robert Raposa
2020-12-17 12:41:40 -05:00
committed by GitHub
parent c589601b5b c5a0ebe219
commit de16529ab6
7 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lms/djangoapps/courseware/tests/test_video_mongo.py
View File

@@ -1200,7 +1200,7 @@ class TestGetHtmlMethod(BaseTestVideoXBlock):
)
DEPRECATE_YOUTUBE_FLAG = waffle_flags()[DEPRECATE_YOUTUBE]
with patch.object(WaffleFlagCourseOverrideModel, 'override_value', return_value=data['course_override']):
with override_flag(DEPRECATE_YOUTUBE_FLAG.namespaced_flag_name, active=data['waffle_enabled']):
with override_flag(DEPRECATE_YOUTUBE_FLAG.name, active=data['waffle_enabled']):
self.initialize_block(data=video_xml, metadata=metadata)
context = self.item_descriptor.render(STUDENT_VIEW).content
self.assertIn(u'"prioritizeHls": {}'.format(data['result']), context)

6
lms/djangoapps/grades/migrations/0018_add_waffle_flag_defaults.py
View File

@@ -15,13 +15,13 @@ def create_flag(apps, schema_editor):
Flag = apps.get_model('waffle', 'Flag')
# Replacement for flag_undefined_default=True on flag definition
Flag.objects.get_or_create(
name=waffle_flags()[REJECTED_EXAM_OVERRIDES_GRADE].namespaced_flag_name, defaults={'everyone': True}
name=waffle_flags()[REJECTED_EXAM_OVERRIDES_GRADE].name, defaults={'everyone': True}
)
Flag.objects.get_or_create(
name=waffle_flags()[ENFORCE_FREEZE_GRADE_AFTER_COURSE_END].namespaced_flag_name, defaults={'everyone': True}
name=waffle_flags()[ENFORCE_FREEZE_GRADE_AFTER_COURSE_END].name, defaults={'everyone': True}
)
Flag.objects.get_or_create(
name=waffle_flags()[WRITABLE_GRADEBOOK].namespaced_flag_name, defaults={'everyone': True}
name=waffle_flags()[WRITABLE_GRADEBOOK].name, defaults={'everyone': True}
)

2
lms/djangoapps/instructor/toggles.py
View File

@@ -22,6 +22,7 @@ WAFFLE_FLAG_NAMESPACE = LegacyWaffleFlagNamespace(name=WAFFLE_NAMESPACE)
DATA_DOWNLOAD_V2 = CourseWaffleFlag(
waffle_namespace=LegacyWaffleFlagNamespace(name=WAFFLE_NAMESPACE, log_prefix='instructor_dashboard: '),
flag_name='enable_data_download_v2',
module_name=__name__,
)
# Waffle flag to use optimised is_small_course.
@@ -39,6 +40,7 @@ DATA_DOWNLOAD_V2 = CourseWaffleFlag(
OPTIMISED_IS_SMALL_COURSE = LegacyWaffleFlag(
waffle_namespace=WAFFLE_FLAG_NAMESPACE,
flag_name='optimised_is_small_course',
module_name=__name__,
)