Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove security-controlpanel and migrate-to-emaillogin view. Fix ISecuri... #36

Merged
merged 1 commit into from
Dec 14, 2014
Merged

Remove security-controlpanel and migrate-to-emaillogin view. Fix ISecuri... #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions plone/app/controlpanel/configure.zcml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@

<!--<adapter factory=".search.SearchControlPanelAdapter" />-->

<adapter factory=".security.SecurityControlPanelAdapter" />

<!--<adapter factory=".site.SiteControlPanelAdapter" />-->

<adapter factory=".skins.SkinsControlPanelAdapter" />
Expand Down Expand Up @@ -113,13 +111,6 @@
/>
-->

<browser:page
name="security-controlpanel"
for="Products.CMFPlone.interfaces.IPloneSiteRoot"
class=".security.SecurityControlPanel"
permission="plone.app.controlpanel.Security"
/>

<!--
<browser:page
name="site-controlpanel"
Expand Down Expand Up @@ -207,14 +198,6 @@
<subscriber
handler=".events.handleConfigurationChangedEvent" />

<browser:page
for="Products.CMFPlone.interfaces.IPloneSiteRoot"
name="migrate-to-emaillogin"
class=".security.EmailLogin"
template="emaillogin.pt"
permission="cmf.ManagePortal"
/>

<browser:page
for="Products.CMFPlone.interfaces.IPloneSiteRoot"
name="syndication-settings"
Expand Down
3 changes: 2 additions & 1 deletion plone/app/controlpanel/usergroups.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,11 @@
from Products.PluggableAuthService.interfaces.plugins import IRolesPlugin

from form import ControlPanelForm, ControlPanelView
from security import ISecuritySchema
from Products.CMFPlone.interfaces import ISecuritySchema

logger = logging.getLogger('plone.app.controlpanel')


class IUserGroupsSettingsSchema(Interface):

many_groups = Bool(title=_(u'Many groups?'),
Expand Down