Skip to content

Commit

Permalink
Conditionally load the zcml for our portlets.
Browse files Browse the repository at this point in the history
Only load them when plone.app.portlets is available and Classic UI is wanted.
This is the default in Plone 6, but may be switched off in 6.1.
In Plone 7 this won't be the default.

See plone/Products.CMFPlone#3923
  • Loading branch information
mauritsvanrees committed Mar 6, 2024
1 parent 71757d6 commit a44933c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
2 changes: 2 additions & 0 deletions news/3923.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Conditionally load the zcml for our portlets.
[maurits]
8 changes: 6 additions & 2 deletions plone/app/event/configure.zcml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit a44933c

Please sign in to comment.