fixes for cookiecutter 2.2

plone · Jul 7, 2023 · 11b1d5b · 11b1d5b
1 parent 9918326
commit 11b1d5b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/cookiecutter.json b/cookiecutter.json
@@ -18,9 +18,9 @@
     "initial_user_password": "",
 
     "load_zcml": {
-        "package_metas": [],
-        "package_includes": [],
-        "package_overrides": [],
+        "package_metas": null,
+        "package_includes": null,
+        "package_overrides": null,
         "locales_directory_location": "",
         "include_file_location": "",
         "overrides_file_location": "",

diff --git a/{{ cookiecutter.target }}/etc/site.zcml b/{{ cookiecutter.target }}/etc/site.zcml
@@ -14,28 +14,35 @@
   <i18n:registerTranslations directory="{{ cookiecutter.load_zcml["locales_directory_location"] }}" />
 {%- endif %}
 
+{%- if cookiecutter.load_zcml.get("package_metas", None) %}
   <!-- META -->
 {%- for value in cookiecutter.load_zcml.get("package_metas", []) %}
   <include package="{{ value }}" file="meta.zcml" />
 {%- endfor %}
   <five:loadProducts file="meta.zcml"/>
+{%- endif %}
 
+{%- if cookiecutter.load_zcml.get("package_includes", None) %}
   <!-- INCLUDES -->
 {%- for value in cookiecutter.load_zcml.get("package_includes", []) %}
   <include package="{{ value }}" />
 {%- endfor %}
+{%- endif %}
   <five:loadProducts />
+
 {%- if cookiecutter.load_zcml.get("include_file_location", "") %}
   <!-- Load the local configuration:  -->
   <include file="{{ cookiecutter.load_zcml["include_file_location"] }}" />
 {%- endif %}
 
-
+{%- if cookiecutter.load_zcml.get("package_overrides", None) %}
   <!-- OVERRIDES -->
 {%- for value in cookiecutter.load_zcml.get("package_overrides", []) %}
   <includeOverrides package="{{ value }}" file="overrides.zcml"/>
 {%- endfor %}
+{%- endif %}
   <five:loadProductsOverrides />
+
 {%- if cookiecutter.load_zcml.get("override_file_location", "") %}
   <!-- Load the local overrides  -->
   <include file="{{ cookiecutter.load_zcml["override_file_location"] }}" />