fix: fall back to settings.COMPREHENSIVE_THEME_DIRS correctly
There was a logical error in the compile_sass management command: instead of falling back to settings.COMPREHENSIVE_THEME_DIRS when --theme-dirs was *None or missing*, we only fell back to it when --theme-dirs was *missing*. This caused theme compilation to be skipped when COMREHENSIVE_THEME_DIRS *is not set* in the environment, even though settings.COMPREHENSIVE_THEME_DIRS *is set* in Django settings, which is currently the case for edx.org.
This commit is contained in:
committed by
Kyle McCormick
parent
21a1235a28
commit
b1393ac3eb
@@ -73,8 +73,8 @@ class Command(BaseCommand):
|
||||
{"lms": "lms", "cms": "cms", "studio": "cms"}[sys]
|
||||
for sys in options.get("system", ["lms", "cms"])
|
||||
)
|
||||
theme_dirs = options.get("theme_dirs", settings.COMPREHENSIVE_THEME_DIRS) or []
|
||||
themes_option = options.get("themes", []) # '[]' means 'all'
|
||||
theme_dirs = options.get("theme_dirs") or settings.COMPREHENSIVE_THEME_DIRS or []
|
||||
themes_option = options.get("themes") or [] # '[]' means 'all'
|
||||
if not settings.ENABLE_COMPREHENSIVE_THEMING:
|
||||
compile_themes = False
|
||||
themes = []
|
||||
|
||||
Reference in New Issue
Block a user