Merge pull request #389 from plone/maurits-conditional-portlets

Conditionally load the zcml for our portlets.
plone · May 7, 2024 · e248da7 · e248da7
2 parents d2aafea + a44933c
commit e248da7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/news/3923.bugfix b/news/3923.bugfix
@@ -0,0 +1,2 @@
+Conditionally load the zcml for our portlets.
+[maurits]
diff --git a/plone/app/event/configure.zcml b/plone/app/event/configure.zcml
@@ -12,19 +12,23 @@
   <include package="plone.event" />
   <include package="plone.resource" />
   <include package="plone.formwidget.recurrence" />
-  <include package="plone.app.portlets" />
   <include package="plone.app.registry" />
   <include package="plone.app.z3cform" />
 
   <!-- internal dependencies -->
   <include file="permissions.zcml" />
   <include package=".dx" />
   <include package=".browser" />
-  <include package=".portlets" />
   <include package=".ical" />
   <include file="recurrence.zcml" />
   <include package=".upgrades" />
 
+  <configure zcml:condition="not-have disable-classic-ui">
+    <configure zcml:condition="installed plone.app.portlets">
+      <include package="plone.app.portlets" />
+      <include package=".portlets" />
+    </configure>
+  </configure>
   <utility
       name="plone.app.event.SynchronizationStrategies"
       component=".vocabularies.SynchronizationStrategies"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		Conditionally load the zcml for our portlets.
		[maurits]