Skip to content

Commit 6b34df5

Browse files
committed
fix: test cases
1 parent 66b8c8d commit 6b34df5

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

xmodule/modulestore/__init__.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
from zoneinfo import ZoneInfo
1616

1717
from django.db import transaction
18+
from django.conf import settings
1819
from opaque_keys.edx.keys import AssetKey, CourseKey
1920
from opaque_keys.edx.locations import Location # For import backwards compatibility
2021
from 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

0 commit comments

Comments
 (0)