fix: fix errors when the settings are not define

eduNEXT · Jun 14, 2023 · f73e613 · f73e613
1 parent 2fd2fa9
commit f73e613
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 5 deletions.
diff --git a/tutordistro/commands/enable_themes.py b/tutordistro/commands/enable_themes.py
@@ -26,5 +26,6 @@ def enable_themes() -> None:
     repository = ThemeGitRepository()
     enabler = ThemeEnabler(repository=repository)
 
-    for theme in config["DISTRO_THEMES"]:
-        enabler(settings=theme, tutor_root=directory, tutor_config=config)
+    if config.get("DISTRO_THEMES"):
+        for theme in config["DISTRO_THEMES"]:
+            enabler(settings=theme, tutor_root=directory, tutor_config=config)
diff --git a/tutordistro/patches/cms-env b/tutordistro/patches/cms-env
@@ -1,2 +1,4 @@
 USE_EOX_TENANT: True
+{% if DISTRO_DEFAULT_SITE_THEME is defined or DISTRO_THEMES_NAME is defined %}
 DEFAULT_SITE_THEME: "{{ DISTRO_DEFAULT_SITE_THEME | default(DISTRO_THEMES_NAME[0]) }}"
+{%- endif -%}
diff --git a/tutordistro/patches/lms-env b/tutordistro/patches/lms-env
@@ -1,4 +1,6 @@
 USE_EOX_TENANT: True
+{% if DISTRO_DEFAULT_SITE_THEME is defined or DISTRO_THEMES_NAME is defined %}
 DEFAULT_SITE_THEME: "{{ DISTRO_DEFAULT_SITE_THEME | default(DISTRO_THEMES_NAME[0]) }}"
+{%- endif -%}
 ENABLE_EOX_THEMING_DERIVE_WORKAROUND: True
 SESSION_COOKIE_DOMAIN: ".{{ LMS_HOST|common_domain(CMS_HOST) }}"
diff --git a/tutordistro/patches/openedx-cms-production-settings b/tutordistro/patches/openedx-cms-production-settings
@@ -11,7 +11,9 @@
 {% endfor %}
 
 COMPREHENSIVE_THEME_DIRS.remove('/openedx/themes')
+{% if DISTRO_THEME_DIRS is defined %}
 COMPREHENSIVE_THEME_DIRS.extend({{ DISTRO_THEME_DIRS }})
+{%- endif -%}
 
 ################## EOX_THEMING ##################
 from lms.envs.common import _make_mako_template_dirs # pylint: disable=import-error

diff --git a/tutordistro/patches/openedx-common-assets-settings b/tutordistro/patches/openedx-common-assets-settings
@@ -11,4 +11,6 @@
 {% endfor %}
 
 COMPREHENSIVE_THEME_DIRS.remove('/openedx/themes')
+{% if DISTRO_THEME_DIRS is defined %}
 COMPREHENSIVE_THEME_DIRS.extend({{ DISTRO_THEME_DIRS }})
+{%- endif -%}
diff --git a/tutordistro/patches/openedx-development-settings b/tutordistro/patches/openedx-development-settings
@@ -11,7 +11,9 @@
 {% endfor %}
 
 COMPREHENSIVE_THEME_DIRS.remove('/openedx/themes')
+{% if DISTRO_THEME_DIRS is defined %}
 COMPREHENSIVE_THEME_DIRS.extend({{ DISTRO_THEME_DIRS }})
+{%- endif -%}
 
 ################## EOX_THEMING ##################
 if "EOX_THEMING_DEFAULT_THEME_NAME" in locals() and EOX_THEMING_DEFAULT_THEME_NAME:
@@ -21,6 +23,6 @@ if "EOX_THEMING_DEFAULT_THEME_NAME" in locals() and EOX_THEMING_DEFAULT_THEME_NA
     derive_settings("lms.envs.devstack")
 # EOL
 
-{% if DISTRO_EXTRA_MIDDLEWARES %}
+{% if DISTRO_EXTRA_MIDDLEWARES is defined %}
 MIDDLEWARE.extend({{ DISTRO_EXTRA_MIDDLEWARES }})
 {%- endif -%}
diff --git a/tutordistro/patches/openedx-dockerfile-post-python-requirements b/tutordistro/patches/openedx-dockerfile-post-python-requirements
@@ -1,4 +1,4 @@
-{%- if DISTRO_INSTALL_EDNX_REQUIREMENTS %}
+{%- if DISTRO_INSTALL_EDNX_REQUIREMENTS is defined and DISTRO_INSTALL_EDNX_REQUIREMENTS %}
 RUN pip install -r ./requirements/edunext/base.txt
 {%- endif %}
 {%- for pkg in iter_values_named(suffix="_DPKG") %}

diff --git a/tutordistro/patches/openedx-dockerfile-pre-assets b/tutordistro/patches/openedx-dockerfile-pre-assets
@@ -4,9 +4,13 @@ RUN openedx-assets xmodule \
     && openedx-assets npm \
     && openedx-assets webpack --env=prod \
     && openedx-assets common
+{% if DISTRO_THEMES_ROOT is defined %}
 COPY --chown=app:app ./themes/ {{ DISTRO_THEMES_ROOT }}
+{% endif %}
+{% if DISTRO_THEME_DIRS is defined and DISTRO_THEMES_NAME is defined %}
 RUN openedx-assets themes \
     --theme-dirs {{ DISTRO_THEME_DIRS | join(' ') }} \
     --themes {{ DISTRO_THEMES_NAME | join(' ') }} \
     && openedx-assets collect --settings=tutor.assets \
     && rdfind -makesymlinks true -followsymlinks true /openedx/staticfiles/
+{% endif %}
diff --git a/tutordistro/patches/openedx-lms-production-settings b/tutordistro/patches/openedx-lms-production-settings
@@ -11,7 +11,9 @@
 {% endfor %}
 
 COMPREHENSIVE_THEME_DIRS.remove('/openedx/themes')
+{% if DISTRO_THEME_DIRS is defined %}
 COMPREHENSIVE_THEME_DIRS.extend({{ DISTRO_THEME_DIRS }})
+{%- endif -%}
 
 ################## EOX_THEMING ##################
 if "EOX_THEMING_DEFAULT_THEME_NAME" in locals() and EOX_THEMING_DEFAULT_THEME_NAME:
@@ -21,6 +23,6 @@ if "EOX_THEMING_DEFAULT_THEME_NAME" in locals() and EOX_THEMING_DEFAULT_THEME_NA
     derive_settings("lms.envs.production")
 # EOL
 
-{% if DISTRO_EXTRA_MIDDLEWARES %}
+{% if DISTRO_EXTRA_MIDDLEWARES is defined %}
 MIDDLEWARE.extend({{ DISTRO_EXTRA_MIDDLEWARES }})
 {%- endif -%}