--- a/src/pyams_security/zmi/plugin/group.py Thu Oct 08 09:30:56 2015 +0200
+++ b/src/pyams_security/zmi/plugin/group.py Thu Oct 08 09:31:45 2015 +0200
@@ -20,6 +20,7 @@
from pyams_skin.interfaces import IPageHeader, IInnerPage
from pyams_skin.interfaces.viewlet import IToolbarAddingMenu, IWidgetTitleViewletManager
from pyams_skin.layer import IPyAMSLayer
+from pyams_utils.interfaces import VIEW_SYSTEM_PERMISSION, MANAGE_SYSTEM_PERMISSION
from pyams_zmi.layer import IAdminLayer
from z3c.form.interfaces import DISPLAY_MODE, IDataExtractedEvent
from z3c.table.interfaces import IColumn, IValues
@@ -55,7 +56,7 @@
@viewlet_config(name='add-groups-folder.menu', context=ISite, layer=IAdminLayer,
view=SecurityManagerPluginsTable, manager=IToolbarAddingMenu,
- permission='system.manage', weight=20)
+ permission=MANAGE_SYSTEM_PERMISSION, weight=20)
class GroupsFolderAddMenu(ToolbarMenuItem):
"""Local groups folder add menu"""
@@ -66,7 +67,7 @@
@pagelet_config(name='add-groups-folder.html', context=ISite, layer=IPyAMSLayer,
- permission='system.manage')
+ permission=MANAGE_SYSTEM_PERMISSION)
class GroupsFolderAddForm(AdminDialogAddForm):
"""Groups folder plug-in add form"""
@@ -99,13 +100,13 @@
@view_config(name='add-groups-folder.json', context=ISite, request_type=IPyAMSLayer,
- permission='system.manage', renderer='json', xhr=True)
+ permission=MANAGE_SYSTEM_PERMISSION, renderer='json', xhr=True)
class GroupsFolderAJAXAddForm(AJAXAddForm, GroupsFolderAddForm):
"""Groups folder plug-in add form, AJAX handler"""
@pagelet_config(name='properties.html', context=IGroupsFolderPlugin, layer=IPyAMSLayer,
- permission='system.view')
+ permission=VIEW_SYSTEM_PERMISSION)
class GroupsFolderEditForm(AdminDialogEditForm):
"""Groups folder plug-in edit form"""
@@ -118,7 +119,7 @@
fields = field.Fields(IGroupsFolderPlugin).omit('__name__', '__parent__')
ajax_handler = 'properties.json'
- edit_permission = 'system.manage'
+ edit_permission = MANAGE_SYSTEM_PERMISSION
def updateWidgets(self, prefix=None):
super(GroupsFolderEditForm, self).updateWidgets()
@@ -126,7 +127,7 @@
@view_config(name='properties.json', context=IGroupsFolderPlugin, request_type=IPyAMSLayer,
- permission='system.manage', renderer='json', xhr=True)
+ permission=MANAGE_SYSTEM_PERMISSION, renderer='json', xhr=True)
class GroupsFolderAJAXEditForm(AJAXEditForm, GroupsFolderEditForm):
"""Groups folder plug-in edit form, AJAX handler"""
@@ -175,7 +176,7 @@
return super(DescriptionColumn, self).getValue(obj) or ''
-@pagelet_config(name='search.html', context=IGroupsFolderPlugin, layer=IPyAMSLayer, permission='system.view')
+@pagelet_config(name='search.html', context=IGroupsFolderPlugin, layer=IPyAMSLayer, permission=VIEW_SYSTEM_PERMISSION)
@implementer(IInnerPage)
class GroupsFolderSearchView(AdminView, ContainerView):
"""Groups folder search view"""
@@ -205,7 +206,7 @@
@viewlet_config(name='groups-folder.toolbar.adding', context=IGroupsFolderPlugin,
view=GroupsFolderContentsTable, layer=IAdminLayer,
- manager=IWidgetTitleViewletManager, permission='system.manage')
+ manager=IWidgetTitleViewletManager, permission=MANAGE_SYSTEM_PERMISSION)
class LocalGroupAddAction(ToolbarAction):
"""Groups folder adding action"""
@@ -214,7 +215,8 @@
modal_target = True
-@pagelet_config(name='add-group.html', context=IGroupsFolderPlugin, layer=IPyAMSLayer, permission='system.manage')
+@pagelet_config(name='add-group.html', context=IGroupsFolderPlugin, layer=IPyAMSLayer,
+ permission=MANAGE_SYSTEM_PERMISSION)
class LocalGroupAddForm(AdminDialogAddForm):
"""Local group add form"""
@@ -230,7 +232,7 @@
fields = field.Fields(ILocalGroup).omit('__parent__', '__name__')
ajax_handler = 'add-group.json'
- edit_permission = 'system.manage'
+ edit_permission = MANAGE_SYSTEM_PERMISSION
def updateWidgets(self, prefix=None):
super(LocalGroupAddForm, self).updateWidgets()
@@ -259,7 +261,7 @@
@view_config(name='add-group.json', context=IGroupsFolderPlugin, request_type=IPyAMSLayer,
- permission='system.manage', renderer='json', xhr=True)
+ permission=MANAGE_SYSTEM_PERMISSION, renderer='json', xhr=True)
class LocalGroupAJAXAddForm(AJAXAddForm, LocalGroupAddForm):
"""Local group add form, AJAX view"""
@@ -270,7 +272,7 @@
'message': translate(_("Group was created successfully"))}
-@pagelet_config(name='properties.html', context=ILocalGroup, layer=IPyAMSLayer, permission='system.view')
+@pagelet_config(name='properties.html', context=ILocalGroup, layer=IPyAMSLayer, permission=VIEW_SYSTEM_PERMISSION)
class LocalGroupEditForm(AdminDialogEditForm):
"""Local group edit form"""
@@ -286,7 +288,7 @@
fields = field.Fields(ILocalGroup).omit('__parent__', '__name__')
ajax_handler = 'properties.json'
- edit_permission = 'system.manage'
+ edit_permission = MANAGE_SYSTEM_PERMISSION
def updateWidgets(self, prefix=None):
super(LocalGroupEditForm, self).updateWidgets()
@@ -294,7 +296,7 @@
@view_config(name='properties.json', context=ILocalGroup, request_type=IPyAMSLayer,
- permission='system.manage', renderer='json', xhr=True)
+ permission=MANAGE_SYSTEM_PERMISSION, renderer='json', xhr=True)
class LocalGroupAJAXEditForm(AJAXEditForm, LocalGroupEditForm):
"""Local group edit form, AJAX view"""