File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1515from zoneinfo import ZoneInfo
1616
1717from django .db import transaction
18+ from django .conf import settings
1819from opaque_keys .edx .keys import AssetKey , CourseKey
1920from opaque_keys .edx .locations import Location # For import backwards compatibility
2021from sortedcontainers import SortedKeyList
@@ -1196,7 +1197,8 @@ def __init__( # lint-amnesty, pylint: disable=unused-argument
11961197 # TODO move the inheritance_cache_subsystem to classes which use it
11971198 self .metadata_inheritance_cache_subsystem = metadata_inheritance_cache_subsystem
11981199 self .request_cache = request_cache
1199- self .xblock_mixins = xblock_mixins
1200+ settings_mixins = getattr (settings , 'XBLOCK_MIXINS' , ())
1201+ self .xblock_mixins = tuple (dict .fromkeys (settings_mixins + xblock_mixins ))
12001202 self .xblock_select = xblock_select
12011203 self .xblock_field_data_wrappers = xblock_field_data_wrappers
12021204 self .disabled_xblock_types = disabled_xblock_types
You can’t perform that action at this time.
0 commit comments