--- a/src/pyams_security/zmi/plugin/userfolder.py	Thu Oct 08 09:30:56 2015 +0200
+++ b/src/pyams_security/zmi/plugin/userfolder.py	Thu Oct 08 09:31:45 2015 +0200
@@ -22,6 +22,7 @@
 from pyams_skin.interfaces.viewlet import IToolbarAddingMenu, IWidgetTitleViewletManager
 from pyams_skin.interfaces import IPageHeader
 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
@@ -59,7 +60,7 @@
 
 @viewlet_config(name='add-users-folder.menu', context=ISite, layer=IAdminLayer,
                 view=SecurityManagerPluginsTable, manager=IToolbarAddingMenu,
-                permission='system.manage', weight=10)
+                permission=MANAGE_SYSTEM_PERMISSION, weight=10)
 class UsersFolderAddMenu(ToolbarMenuItem):
     """Local users folder add menu"""
 
@@ -70,7 +71,7 @@
 
 
 @pagelet_config(name='add-users-folder.html', context=ISite, layer=IPyAMSLayer,
-                permission='system.manage')
+                permission=MANAGE_SYSTEM_PERMISSION)
 class UsersFolderAddForm(AdminDialogAddForm):
     """Users folder plug-in add form"""
 
@@ -80,7 +81,7 @@
 
     fields = field.Fields(IUsersFolderPlugin).omit('__name__', '__parent__')
     ajax_handler = 'add-users-folder.json'
-    edit_permission = 'system.manage'
+    edit_permission = MANAGE_SYSTEM_PERMISSION
 
     def create(self, data):
         return UsersFolder()
@@ -103,13 +104,13 @@
 
 
 @view_config(name='add-users-folder.json', context=ISite, request_type=IPyAMSLayer,
-             permission='system.manage', renderer='json', xhr=True)
+             permission=MANAGE_SYSTEM_PERMISSION, renderer='json', xhr=True)
 class UsersFolderAJAXAddForm(AJAXAddForm, UsersFolderAddForm):
     """users folder plug-in add form, AJAX handler"""
 
 
 @pagelet_config(name='properties.html', context=IUsersFolderPlugin, layer=IPyAMSLayer,
-                permission='system.view')
+                permission=VIEW_SYSTEM_PERMISSION)
 class UsersFolderEditForm(AdminDialogEditForm):
     """Users folder plug-in edit form"""
 
@@ -122,7 +123,7 @@
 
     fields = field.Fields(IUsersFolderPlugin).omit('__name__', '__parent__')
     ajax_handler = 'properties.json'
-    edit_permission = 'system.manage'
+    edit_permission = MANAGE_SYSTEM_PERMISSION
 
     def updateWidgets(self, prefix=None):
         super(UsersFolderEditForm, self).updateWidgets()
@@ -130,7 +131,7 @@
 
 
 @view_config(name='properties.json', context=IUsersFolderPlugin, request_type=IPyAMSLayer,
-             permission='system.manage', renderer='json', xhr=True)
+             permission=MANAGE_SYSTEM_PERMISSION, renderer='json', xhr=True)
 class UsersFolderAJAXEditForm(AJAXEditForm, UsersFolderEditForm):
     """Users folder plug-in edit form, AJAX handler"""
 
@@ -139,7 +140,7 @@
 # Users folder search views
 #
 
-@pagelet_config(name='search.html', context=IUsersFolderPlugin, layer=IPyAMSLayer, permission='system.view')
+@pagelet_config(name='search.html', context=IUsersFolderPlugin, layer=IPyAMSLayer, permission=VIEW_SYSTEM_PERMISSION)
 class UsersFolderSearchView(AdminView, SearchView):
     """Users folder search view"""
     
@@ -161,7 +162,7 @@
 
 
 @view_config(name='search-results.html', context=IUsersFolderPlugin, request_type=IPyAMSLayer,
-             permission='system.view')
+             permission=VIEW_SYSTEM_PERMISSION)
 class UsersFolderSearchResultsView(AdminView, SearchResultsView):
     """Users folder search results view table"""
 
@@ -241,7 +242,7 @@
 
 @viewlet_config(name='users-folder.toolbar.adding', context=IUsersFolderPlugin,
                 view=UsersFolderSearchView.search_form_factory, layer=IAdminLayer,
-                manager=IWidgetTitleViewletManager, permission='system.manage')
+                manager=IWidgetTitleViewletManager, permission=MANAGE_SYSTEM_PERMISSION)
 class LocalUserAddAction(ToolbarAction):
     """Users folder adding action"""
 
@@ -250,7 +251,8 @@
     modal_target = True
 
 
-@pagelet_config(name='add-user.html', context=IUsersFolderPlugin, layer=IPyAMSLayer, permission='system.manage')
+@pagelet_config(name='add-user.html', context=IUsersFolderPlugin, layer=IPyAMSLayer,
+                permission=MANAGE_SYSTEM_PERMISSION)
 class LocalUserAddForm(AdminDialogAddForm):
     """Local user add form"""
 
@@ -270,7 +272,7 @@
 
     autocomplete = 'off'
     ajax_handler = 'add-user.json'
-    edit_permission = 'system.manage'
+    edit_permission = MANAGE_SYSTEM_PERMISSION
 
     def updateWidgets(self, prefix=None):
         super(LocalUserAddForm, self).updateWidgets()
@@ -312,7 +314,7 @@
 
 
 @view_config(name='add-user.json', context=IUsersFolderPlugin, request_type=IPyAMSLayer,
-             permission='system.manage', renderer='json', xhr=True)
+             permission=MANAGE_SYSTEM_PERMISSION, renderer='json', xhr=True)
 class LocalUserAJAXAddForm(AJAXAddForm, LocalUserAddForm):
     """Local user add form, AJAX view"""
 
@@ -322,7 +324,7 @@
                 'message': translate(_("User was created successfully"))}
 
 
-@pagelet_config(name='properties.html', context=ILocalUser, layer=IPyAMSLayer, permission='system.view')
+@pagelet_config(name='properties.html', context=ILocalUser, layer=IPyAMSLayer, permission=VIEW_SYSTEM_PERMISSION)
 class LocalUserEditForm(AdminDialogEditForm):
     """Local user edit form"""
 
@@ -339,7 +341,7 @@
                                              'self_registered', 'activation_hash', 'activation_date')
 
     ajax_handler = 'properties.json'
-    edit_permission = 'system.manage'
+    edit_permission = MANAGE_SYSTEM_PERMISSION
 
     def updateWidgets(self, prefix=None):
         super(LocalUserEditForm, self).updateWidgets()
@@ -349,6 +351,6 @@
 
 
 @view_config(name='properties.json', context=ILocalUser, request_type=IPyAMSLayer,
-             permission='system.manage', renderer='json', xhr=True)
+             permission=MANAGE_SYSTEM_PERMISSION, renderer='json', xhr=True)
 class LocalUserAJAXEditForm(AJAXEditForm, LocalUserEditForm):
     """Local user edit form, AJAX view"""