--- a/src/pyams_zmi/control_panel.py Thu Aug 27 11:27:44 2015 +0200
+++ b/src/pyams_zmi/control_panel.py Thu Oct 08 09:42:02 2015 +0200
@@ -20,6 +20,7 @@
from pyams_skin.interfaces import IInnerPage, IPageHeader, IContentHelp
from pyams_skin.interfaces.container import ITableWithActions
from pyams_skin.layer import IPyAMSLayer
+from pyams_utils.interfaces import VIEW_SYSTEM_PERMISSION, MANAGE_SYSTEM_PERMISSION
from pyams_utils.interfaces.site import IOptionalUtility
from pyams_zmi.interfaces.menu import IControlPanelMenu, IUtilitiesMenu
from pyams_zmi.layer import IAdminLayer
@@ -52,7 +53,7 @@
#
@viewlet_config(name='utilities.menu', layer=IAdminLayer, context=ISite, manager=IControlPanelMenu,
- permission='system.view', weight=1)
+ permission=VIEW_SYSTEM_PERMISSION, weight=1)
@viewletmanager_config(name='utilities.menu', layer=IAdminLayer, context=ISite, provides=IUtilitiesMenu)
@implementer(IUtilitiesMenu)
class UtilitiesMenuItem(MenuItem):
@@ -73,10 +74,10 @@
@property
def data_attributes(self):
- attrs = super(UtilitiesTable, self).data_attributes
- attrs['table'] = {'data-ams-location': absolute_url(self.context, self.request),
- 'data-ams-delete-target': 'delete-utility.json'}
- return attrs
+ attributes = super(UtilitiesTable, self).data_attributes
+ attributes['table'] = {'data-ams-location': absolute_url(self.context, self.request),
+ 'data-ams-delete-target': 'delete-utility.json'}
+ return attributes
@adapter_config(name='trash', context=(Interface, IAdminLayer, UtilitiesTable), provides=IColumn)
@@ -84,7 +85,7 @@
"""Utilities trash column"""
icon_hint = _("Delete utility")
- permission = 'system.manage'
+ permission = MANAGE_SYSTEM_PERMISSION
checker = lambda col, x: IOptionalUtility.providedBy(x)
@@ -98,7 +99,7 @@
return list(self.context.getSiteManager().values())
-@pagelet_config(name='utilities.html', context=ISite, layer=IPyAMSLayer, permission='system.view')
+@pagelet_config(name='utilities.html', context=ISite, layer=IPyAMSLayer, permission=VIEW_SYSTEM_PERMISSION)
@implementer(IInnerPage)
class UtilitiesView(AdminView, ContainerView):
"""Control panel view"""
@@ -118,7 +119,7 @@
@view_config(name='delete-utility.json', context=ISite, request_type=IPyAMSLayer,
- permission='system.manage', renderer='json', xhr=True)
+ permission=MANAGE_SYSTEM_PERMISSION, renderer='json', xhr=True)
def delete_utility(request):
"""Delete utility from site manager"""
translate = request.localizer.translate
@@ -201,7 +202,7 @@
#
@viewlet_config(name='local-registrations.menu', layer=IAdminLayer, context=ISite, manager=IUtilitiesMenu,
- permission='system.view', weight=1)
+ permission=VIEW_SYSTEM_PERMISSION, weight=1)
class LocalRegistrationsMenuItem(MenuItem):
"""Local registrations menu"""
@@ -228,7 +229,7 @@
return list(self.context.getSiteManager().registeredUtilities())
-@pagelet_config(name='local-registrations.html', context=ISite, layer=IPyAMSLayer, permission='system.view')
+@pagelet_config(name='local-registrations.html', context=ISite, layer=IPyAMSLayer, permission=VIEW_SYSTEM_PERMISSION)
@implementer(IInnerPage)
class LocalRegistrationsView(AdminView, ContainerView):
"""Registrations view"""
@@ -265,7 +266,7 @@
#
@viewlet_config(name='global-registrations.menu', layer=IAdminLayer, context=ISite, manager=IUtilitiesMenu,
- permission='system.view', weight=2)
+ permission=VIEW_SYSTEM_PERMISSION, weight=2)
class GlobalRegistrationsMenuItem(MenuItem):
"""Global registrations menu"""
@@ -292,7 +293,7 @@
return list(registered_utilities())
-@pagelet_config(name='global-registrations.html', context=ISite, layer=IPyAMSLayer, permission='system.view')
+@pagelet_config(name='global-registrations.html', context=ISite, layer=IPyAMSLayer, permission=VIEW_SYSTEM_PERMISSION)
@implementer(IInnerPage)
class GlobalRegistrationsView(AdminView, ContainerView):
"""Global registrations view"""