fix:wrong CMS development settings

eduNEXT · Nov 2, 2023 · df1588c · df1588c
1 parent 291beb3
commit df1588c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 12 deletions.
diff --git a/tutordistro/patches/openedx-cms-development-settings b/tutordistro/patches/openedx-cms-development-settings
@@ -9,3 +9,14 @@
 # End {{ pkg["name"] }} settings
 {%- endif -%}
 {% endfor %}
+
+{%- for pkg in iter_values_named(suffix="_DPKG") %}
+{%- if pkg["name"] == 'eox-theming' %}
+################## EOX_THEMING ##################
+from lms.envs.common import _make_mako_template_dirs # pylint: disable=import-error
+ENABLE_COMPREHENSIVE_THEMING = True
+TEMPLATES[1]["DIRS"] = _make_mako_template_dirs
+derive_settings("cms.envs.devstack")
+# EOL
+{%- endif %}
+{%- endfor %}
diff --git a/tutordistro/patches/openedx-development-settings b/tutordistro/patches/openedx-development-settings
@@ -15,18 +15,6 @@ COMPREHENSIVE_THEME_DIRS.remove('/openedx/themes')
 COMPREHENSIVE_THEME_DIRS.extend({{ DISTRO_THEME_DIRS }})
 {%- endif %}
 
-{%- for pkg in iter_values_named(suffix="_DPKG") %}
-{%- if pkg["name"] == 'eox-theming' %}
-################## EOX_THEMING ##################
-if "EOX_THEMING_DEFAULT_THEME_NAME" in locals() and EOX_THEMING_DEFAULT_THEME_NAME:
-    from lms.envs.common import _make_mako_template_dirs # pylint: disable=import-error
-    ENABLE_COMPREHENSIVE_THEMING = True
-    TEMPLATES[1]["DIRS"] = _make_mako_template_dirs
-    derive_settings("lms.envs.devstack")
-# EOL
-{%- endif %}
-{%- endfor %}
-
 {%- if DISTRO_EXTRA_MIDDLEWARES is defined %}
 MIDDLEWARE.extend({{ DISTRO_EXTRA_MIDDLEWARES }})
 {% endif %}
diff --git a/tutordistro/patches/openedx-lms-development-settings b/tutordistro/patches/openedx-lms-development-settings
@@ -1 +1,14 @@
 SESSION_COOKIE_DOMAIN = ".{{ LMS_HOST|common_domain(CMS_HOST) }}"
+
+{%- for pkg in iter_values_named(suffix="_DPKG") %}
+{%- if pkg["name"] == 'eox-theming' %}
+################## EOX_THEMING ##################
+if "EOX_THEMING_DEFAULT_THEME_NAME" in locals() and EOX_THEMING_DEFAULT_THEME_NAME:
+    from lms.envs.common import _make_mako_template_dirs # pylint: disable=import-error
+    ENABLE_COMPREHENSIVE_THEMING = True
+    TEMPLATES[1]["DIRS"] = _make_mako_template_dirs
+    derive_settings("lms.envs.devstack")
+
+# EOL
+{%- endif %}
+{%- endfor %}