NXP-32089: Strict mode property must take precedence

nuxeo · Oct 3, 2023 · 1547920 · 1547920
1 parent 41ac86a
commit 1547920
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/...sources/install/templates/retention/nxserver/config/retention-compliance-config.xml.nxftl b/...sources/install/templates/retention/nxserver/config/retention-compliance-config.xml.nxftl
@@ -1,6 +1,11 @@
 <?xml version="1.0"?>
 <component name="org.nuxeo.retention.compliance.types">
-<#if "${nuxeo.retention.compliance.enabled}" == "true">
+<#assign
+  isStrictDefined = (nuxeo.retention.strictmode.enabled)??
+  isStrictTrue=isStrictDefined && "${nuxeo.retention.strictmode.enabled}" == "true"
+  isCompliantTrue="${nuxeo.retention.compliance.enabled}" == "true"
+>
+<#if isStrictTrue || (!isStrictDefined && isCompliantTrue)>
   <require>org.nuxeo.retention.types</require>
 
   <extension target="org.nuxeo.ecm.core.schema.TypeService" point="schema">