Skip to content

Commit

Permalink
Merge pull request #37 from plone/usergroups_controlpanel
Browse files Browse the repository at this point in the history
Remove the users/groups control panel (moved to Products.CMFPlone).
  • Loading branch information
tisto committed Dec 22, 2014
2 parents 707b9b4 + 99b8924 commit 3668e92
Show file tree
Hide file tree
Showing 11 changed files with 8 additions and 2,627 deletions.
3 changes: 3 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ Changelog
3.0.0 (unreleased)
------------------

- Remove the users/groups control panel (moved to Products.CMFPlone).
[timo]

- Remove the markup control panel, as it was moved to Products.CMFPlone.
[thet]

Expand Down
49 changes: 0 additions & 49 deletions plone/app/controlpanel/configure.zcml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,6 @@

<adapter factory=".skins.SkinsControlPanelAdapter" />

<adapter factory=".usergroups.UserGroupsSettingsControlPanelAdapter" />

<browser:page
name="filter-controlpanel"
for="Products.CMFPlone.interfaces.IPloneSiteRoot"
Expand Down Expand Up @@ -45,53 +43,6 @@
permission="plone.app.controlpanel.Themes"
/>

<browser:page
name="usergroup-userprefs"
for="Products.CMFPlone.interfaces.IPloneSiteRoot"
class=".usergroups.UsersOverviewControlPanel"
permission="plone.app.controlpanel.UsersAndGroups"
template="usergroups_usersoverview.pt"
/>

<browser:page
name="usergroup-groupprefs"
for="Products.CMFPlone.interfaces.IPloneSiteRoot"
class=".usergroups.GroupsOverviewControlPanel"
permission="plone.app.controlpanel.UsersAndGroups"
template="usergroups_groupsoverview.pt"
/>

<browser:page
name="usergroup-controlpanel"
for="Products.CMFPlone.interfaces.IPloneSiteRoot"
class=".usergroups.UserGroupsSettingsControlPanel"
permission="plone.app.controlpanel.UsersAndGroups"
/>

<browser:page
name="usergroup-groupmembership"
for="Products.CMFPlone.interfaces.IPloneSiteRoot"
class=".usergroups.GroupMembershipControlPanel"
permission="plone.app.controlpanel.UsersAndGroups"
template="usergroups_groupmembership.pt"
/>

<browser:page
name="usergroup-usermembership"
for="Products.CMFPlone.interfaces.IPloneSiteRoot"
class=".usergroups.UserMembershipControlPanel"
permission="plone.app.controlpanel.UsersAndGroups"
template="usergroups_usermembership.pt"
/>

<browser:page
name="usergroup-groupdetails"
for="Products.CMFPlone.interfaces.IPloneSiteRoot"
class=".usergroups.GroupDetailsControlPanel"
permission="plone.app.controlpanel.UsersAndGroups"
template="usergroups_groupdetails.pt"
/>

<view
type="zope.publisher.interfaces.browser.IBrowserRequest"
for="zope.schema.interfaces.ITuple
Expand Down
10 changes: 5 additions & 5 deletions plone/app/controlpanel/tests/test_doctests.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@ def test_suite():
package="plone.app.controlpanel.tests",
test_class=ControlPanelTestCase))

suite.addTest(FunctionalDocFileSuite(
'usergroups.txt',
optionflags=OPTIONFLAGS,
package="plone.app.controlpanel.tests",
test_class=UserGroupsControlPanelTestCase))
# suite.addTest(FunctionalDocFileSuite(
# 'usergroups.txt',
# optionflags=OPTIONFLAGS,
# package="plone.app.controlpanel.tests",
# test_class=UserGroupsControlPanelTestCase))

# suite.addTest(FunctionalDocFileSuite(
# 'security.txt',
Expand Down
Loading

0 comments on commit 3668e92

Please sign in to comment.