From: Hanno S. <svn...@pl...> - 2009-02-28 17:32:23
|
Author: hannosch Date: Sat Feb 28 17:32:20 2009 New Revision: 25354 Modified: Plone/trunk/Products/CMFPlone/configure.zcml Plone/trunk/Products/CMFPlone/profiles/default/rolemap.xml Plone/trunk/docs/NEWS.txt Plone/trunk/setup.py Log: Iterate is optional as well Modified: Plone/trunk/Products/CMFPlone/configure.zcml ============================================================================== --- Plone/trunk/Products/CMFPlone/configure.zcml (original) +++ Plone/trunk/Products/CMFPlone/configure.zcml Sat Feb 28 17:32:20 2009 @@ -13,7 +13,6 @@ <include package="plone.app.customerize" /> <include package="plone.app.form" /> <include package="plone.app.i18n" /> - <include package="plone.app.iterate" /> <include package="plone.app.javascript" /> <include package="plone.app.layout" /> <include package="plone.app.openid" /> @@ -34,6 +33,9 @@ <include zcml:condition="installed plone.app.contentrules" package="plone.app.contentrules" /> + <include + zcml:condition="installed plone.app.iterate" + package="plone.app.iterate" /> <!-- viewlets zope 3 layers support for themes --> <include package="plone.browserlayer" /> Modified: Plone/trunk/Products/CMFPlone/profiles/default/rolemap.xml ============================================================================== --- Plone/trunk/Products/CMFPlone/profiles/default/rolemap.xml (original) +++ Plone/trunk/Products/CMFPlone/profiles/default/rolemap.xml Sat Feb 28 17:32:20 2009 @@ -150,18 +150,6 @@ <role name="Manager"/> <role name="Member"/> </permission> - <permission name="iterate : Check in content" - acquire="True"> - <role name="Owner"/> - <role name="Manager"/> - <role name="Editor"/> - </permission> - <permission name="iterate : Check out content" - acquire="True"> - <role name="Owner"/> - <role name="Manager"/> - <role name="Editor"/> - </permission> <permission name="View" acquire="True"> <role name="Reader" /> Modified: Plone/trunk/docs/NEWS.txt ============================================================================== --- Plone/trunk/docs/NEWS.txt (original) +++ Plone/trunk/docs/NEWS.txt Sat Feb 28 17:32:20 2009 @@ -8,7 +8,8 @@ Plone 4.0 - UNRELEASED ---------------------- -- Turned contentrules into an optional dependency installable on its own. +- Turned contentrules and iterate into an optional dependencies installable + on their own. [hannosch] - Removed the unused ie5fixes.js. This closes Modified: Plone/trunk/setup.py ============================================================================== --- Plone/trunk/setup.py (original) +++ Plone/trunk/setup.py Sat Feb 28 17:32:20 2009 @@ -34,6 +34,7 @@ app=[ 'plone.contentrules', 'plone.app.contentrules', + 'plone.app.iterate', ], ), install_requires=[ @@ -72,7 +73,6 @@ 'plone.app.customerize', 'plone.app.form', 'plone.app.i18n', - 'plone.app.iterate', 'plone.app.javascript', 'plone.app.layout', 'plone.app.openid', |