--- a/src/pyams_scheduler/zmi/scheduler.py Thu Oct 08 11:12:35 2015 +0200
+++ b/src/pyams_scheduler/zmi/scheduler.py Thu Oct 08 11:31:03 2015 +0200
@@ -26,6 +26,7 @@
from pyams_skin.interfaces import IInnerPage, IPageHeader
from pyams_skin.interfaces.container import ITableElementEditor
from pyams_skin.layer import IPyAMSLayer
+from pyams_utils.interfaces import VIEW_SYSTEM_PERMISSION, MANAGE_SYSTEM_PERMISSION
from pyams_zmi.interfaces.menu import IControlPanelMenu
from pyams_zmi.layer import IAdminLayer
from z3c.table.interfaces import IColumn, IValues
@@ -72,7 +73,7 @@
@viewlet_config(name='scheduler.menu', context=ISite, layer=IAdminLayer, manager=IControlPanelMenu,
- permission='system.view', weight=10)
+ permission=VIEW_SYSTEM_PERMISSION, weight=10)
@viewletmanager_config(name='scheduler.menu', context=ISite, layer=IAdminLayer)
@implementer(ISchedulerMenu)
class SchedulerMenuItem(MenuItem):
@@ -120,7 +121,7 @@
target = None
modal_target = True
- permission = 'system.view'
+ permission = VIEW_SYSTEM_PERMISSION
weight = 1
@@ -134,7 +135,7 @@
target = None
modal_target = True
- permission = 'system.view'
+ permission = VIEW_SYSTEM_PERMISSION
weight = 2
@@ -157,7 +158,7 @@
target = None
modal_target = True
- permission = 'system.manage'
+ permission = MANAGE_SYSTEM_PERMISSION
weight = 20
@@ -171,7 +172,7 @@
target = None
modal_target = True
- permission = 'system.view'
+ permission = VIEW_SYSTEM_PERMISSION
weight = 30
@@ -180,11 +181,11 @@
"""Scheduler tasks trash column"""
icon_hint = _("Delete task")
- permission = 'system.manage'
+ permission = MANAGE_SYSTEM_PERMISSION
@view_config(name='delete-task.json', context=IScheduler, request_type=IPyAMSLayer,
- permission='system.manage', renderer='json', xhr=True)
+ permission=MANAGE_SYSTEM_PERMISSION, renderer='json', xhr=True)
def delete_scheduler_task(request):
"""Delete task from scheduler utility"""
translate = request.localizer.translate
@@ -213,7 +214,7 @@
return ()
-@pagelet_config(name='scheduler-tasks.html', context=ISite, layer=IPyAMSLayer, permission='system.view')
+@pagelet_config(name='scheduler-tasks.html', context=ISite, layer=IPyAMSLayer, permission=VIEW_SYSTEM_PERMISSION)
@implementer(IInnerPage)
class SchedulerTasksView(AdminView, ContainerView):
"""Scheduler tasks view"""
@@ -234,7 +235,7 @@
@viewlet_config(name='scheduler.properties.menu', context=ISite, layer=IAdminLayer,
- manager=ISchedulerMenu, permission='system.view', weight=1)
+ manager=ISchedulerMenu, permission=VIEW_SYSTEM_PERMISSION, weight=1)
class SchedulerPropertiesMenuItem(MenuItem):
"""Scheduler properties menu"""
@@ -247,7 +248,7 @@
return resource_url(manager, self.request, self.url)
-@pagelet_config(name='properties.html', context=IScheduler, layer=IPyAMSLayer, permission='system.view')
+@pagelet_config(name='properties.html', context=IScheduler, layer=IPyAMSLayer, permission=VIEW_SYSTEM_PERMISSION)
class SchedulerPropertiesEditForm(AdminDialogEditForm):
"""Scheduler properties edit form"""
@@ -259,17 +260,17 @@
fields = field.Fields(IScheduler).omit('__parent__', '__name__', 'tasks', 'history')
ajax_handler = 'properties.json'
- edit_permission = 'system.manage'
+ edit_permission = MANAGE_SYSTEM_PERMISSION
@view_config(name='properties.json', context=IScheduler, request_type=IPyAMSLayer,
- permission='system.manage', renderer='json', xhr=True)
+ permission=MANAGE_SYSTEM_PERMISSION, renderer='json', xhr=True)
class SchedulerPropertiesAJAXEditForm(AJAXEditForm, SchedulerPropertiesEditForm):
"""Scheduler properties edit form, AJAX view"""
@viewlet_config(name='scheduler.jobs.menu', context=ISite, layer=IAdminLayer,
- manager=ISchedulerMenu, permission='system.view', weight=5)
+ manager=ISchedulerMenu, permission=VIEW_SYSTEM_PERMISSION, weight=5)
class SchedulerJobsMenuItem(MenuItem):
"""Scheduler jobs menu"""
@@ -282,7 +283,7 @@
return resource_url(manager, self.request, self.url)
-@pagelet_config(name='jobs.html', context=IScheduler, layer=IPyAMSLayer, permission='system.view')
+@pagelet_config(name='jobs.html', context=IScheduler, layer=IPyAMSLayer, permission=VIEW_SYSTEM_PERMISSION)
class SchedulerJobsDisplayForm(AdminDialogDisplayForm):
"""Scheduler jobs display form"""