Skip to content

Commit

Permalink
Fix possible startup error by loading plone.app.contentrules zcml (#1645
Browse files Browse the repository at this point in the history
)

Fix possible startup error by explicitly loading ``plone.app.contentrules`` zcml.

Also: only load code related to contentrules when this package is available.
Fixes #1644
But reported here at first:
https://community.plone.org/t/plone-6-0-5-soft-released/17490/3?u=mauritsvanrees
  • Loading branch information
mauritsvanrees committed May 27, 2023
1 parent b67c611 commit 11275de
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 2 deletions.
3 changes: 3 additions & 0 deletions news/1644.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Fix possible startup error by explicitly loading ``plone.app.contentrules`` zcml.
Also: only load code related to contentrules when this package is available.
[maurits]
6 changes: 5 additions & 1 deletion src/plone/restapi/serializer/controlpanels/configure.zcml
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
<configure
xmlns="http://namespaces.zope.org/zope"
xmlns:zcml="http://namespaces.zope.org/zcml"
i18n_domain="plone.restapi"
>

<adapter factory=".ControlpanelSerializeToJson" />
<adapter factory=".ControlpanelSummarySerializeToJson" />
<adapter factory=".types.DexterityTypesControlpanelSerializeToJson" />
<adapter factory=".rules.ContentRulesControlpanelSerializeToJson" />
<adapter
factory=".rules.ContentRulesControlpanelSerializeToJson"
zcml:condition="installed plone.app.contentrules"
/>

</configure>
5 changes: 4 additions & 1 deletion src/plone/restapi/services/configure.zcml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
<include package=".registry" />
<include package=".relations" />
<include package=".roles" />
<include package=".rules" />
<include package=".search" />
<include package=".system" />
<include package=".sources" />
Expand Down Expand Up @@ -63,4 +62,8 @@
package=".tiles"
zcml:condition="installed plone.tiles"
/>
<include
package=".rules"
zcml:condition="installed plone.app.contentrules"
/>
</configure>
1 change: 1 addition & 0 deletions src/plone/restapi/services/controlpanels/configure.zcml
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@
factory="plone.restapi.controlpanels.rules.ContentRulesControlpanel"
provides="plone.restapi.controlpanels.interfaces.IContentRulesControlpanel"
name="content-rules"
zcml:condition="installed plone.app.contentrules"
/>

<configure zcml:condition="have plone-5">
Expand Down
2 changes: 2 additions & 0 deletions src/plone/restapi/services/rules/configure.zcml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
xmlns:plone="http://namespaces.plone.org/plone"
>

<include package="plone.app.contentrules" />

<plone:service
method="GET"
factory=".get.ContentRulesGet"
Expand Down

0 comments on commit 11275de

Please sign in to comment.