Skip to content

Commit

Permalink
Cleanup CMFDefault references (#2017)
Browse files Browse the repository at this point in the history 
Cleanup CMFDefault references

Products.CMFDefault got removed long ago #438

These lines should not be relevant anymore.
  • Loading branch information
@gforcada @jensens
gforcada authored and jensens committed Apr 13, 2017
1 parent 5e66202 commit 2465f73
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 11 deletions.
4 changes: 3 additions & 1 deletion CHANGES.rst
View file
Expand Up @@ -23,6 +23,9 @@ New features:

Bug fixes:

- Remove references to Products.CMFDefault on meta.zcml
[gforcada]

- Adapt tests to render social metadata only if you are anonymous.
[bsuttor]

Expand All @@ -44,7 +47,6 @@ Bug fixes:
content
[datakurre]


5.1b3 (2017-04-03)
------------------

Expand Down
10 changes: 0 additions & 10 deletions Products/CMFPlone/meta.zcml
View file
Expand Up @@ -18,16 +18,6 @@
<meta:provides feature="plone-5" />
<meta:provides feature="plone-51" />

<!-- Exclude directives need to be executed before the ZCML file would
be loaded. Doing this during the meta.zcml phase ensures this.
The functionality in the following packages is not used and might
interfere with Plone's own. -->
<configure zcml:condition="installed Products.CMFDefault">
<exclude package="Products.CMFDefault.browser" file="configure.zcml" />
<exclude package="Products.CMFDefault.formlib" file="configure.zcml" />
<exclude package="Products.CMFDefault.upgrade" file="configure.zcml" />
</configure>

<include package="Products.CMFCore" file="meta.zcml" />
<include package="Products.GenericSetup" file="meta.zcml" />

Expand Down

2 comments on commit 2465f73

@MrTango
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commit breaks compatibility with addons that uses formlib, like referencebrowser widget in Archetypes.
Is there any concrete reason to remove the exclude statemants?
If I revert that, everything owrks for me again.
see https://community.plone.org/t/addform-isnt-called-for-dx-types-if-easynewsletter-is-added-to-buildout-coredev/4256
and plone/plone.app.z3cform#72

@gforcada
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@MrTango oops sorry I had no idea I broke those.

I see that you already added them back, would you mind adding a comment on top of them to prevent that me or others clean that up again? 😉

Or even better, why not remove those ZCML's from CMFDefault so that they don't need to be excluded to begin with? (If I understood correctly the comment and that is the purpose of those lines)

Please sign in to comment.