diff -r 23ac4c21b235 -r 6cb6acc05cc3 src/pyams_thesaurus/zmi/extract.py --- a/src/pyams_thesaurus/zmi/extract.py Thu Oct 08 11:41:02 2015 +0200 +++ b/src/pyams_thesaurus/zmi/extract.py Thu Oct 08 12:15:52 2015 +0200 @@ -20,8 +20,10 @@ from pyams_form.interfaces.form import IWidgetsPrefixViewletsManager from pyams_skin.interfaces.viewlet import IWidgetTitleViewletManager from pyams_skin.layer import IPyAMSLayer +from pyams_thesaurus.interfaces import ADMIN_THESAURUS_PERMISSION, MANAGE_THESAURUS_EXTRACT_PERMISSION from pyams_thesaurus.interfaces.thesaurus import IThesaurus, IThesaurusExtracts, IThesaurusExtractInfo, \ IThesaurusExtract +from pyams_utils.interfaces import VIEW_PERMISSION from pyams_utils.interfaces.data import IObjectData from pyams_utils.interfaces.tree import INode, ITree from pyams_zmi.layer import IAdminLayer @@ -57,11 +59,11 @@ @property def data_attributes(self): - attrs = super(ThesaurusExtractsTable, self).data_attributes - table = attrs.setdefault('table', {}) + attributes = super(ThesaurusExtractsTable, self).data_attributes + table = attributes.setdefault('table', {}) table.setdefault('data-ams-location', absolute_url(self.context, self.request, '++extracts++')) table.setdefault('data-ams-delete-target', 'delete-extract.json') - return attrs + return attributes cssClasses = {'table': 'table table-bordered table-striped table-hover table-tight datatable extracts'} @@ -115,11 +117,11 @@ """Thesaurus extracts trash column""" icon_hint = _("Delete extract") - permission = 'thesaurus.admin' + permission = ADMIN_THESAURUS_PERMISSION @viewlet_config(name='thesaurus.extract.adding', context=IThesaurus, view=ThesaurusExtractsTable, - layer=IAdminLayer, manager=IWidgetTitleViewletManager, permission='thesaurus.admin') + layer=IAdminLayer, manager=IWidgetTitleViewletManager, permission=ADMIN_THESAURUS_PERMISSION) class ThesaurusExtractAddAction(ToolbarAction): """Thesaurus extract add action""" @@ -128,7 +130,7 @@ modal_target = True -@pagelet_config(name='add-extract.html', context=IThesaurus, layer=IPyAMSLayer, permission='thesaurus.admin') +@pagelet_config(name='add-extract.html', context=IThesaurus, layer=IPyAMSLayer, permission=ADMIN_THESAURUS_PERMISSION) class ThesaurusExtractAddForm(AdminDialogAddForm): """Thesaurus extract add form""" @@ -163,13 +165,13 @@ @view_config(name='add-extract.json', context=IThesaurus, request_type=IPyAMSLayer, - permission='thesaurus.admin', renderer='json', xhr=True) + permission=ADMIN_THESAURUS_PERMISSION, renderer='json', xhr=True) class ThesaurusExtractAJAXAddForm(AJAXAddForm, ThesaurusExtractAddForm): """Thesaurus extract add form, AJAX view""" @pagelet_config(name='properties.html', context=IThesaurusExtract, layer=IPyAMSLayer, - permission='thesaurus.extract.manage') + permission=MANAGE_THESAURUS_EXTRACT_PERMISSION) class ThesaurusExtractEditForm(AdminDialogEditForm): """Thesaurus extract edit form""" @@ -184,7 +186,7 @@ fields = field.Fields(IThesaurusExtractInfo) ajax_handler = 'properties.json' - edit_permission = 'thesaurus.extract.manage' + edit_permission = MANAGE_THESAURUS_EXTRACT_PERMISSION def updateWidgets(self, prefix=None): super(ThesaurusExtractEditForm, self).updateWidgets(prefix) @@ -196,7 +198,7 @@ @view_config(name='properties.json', context=IThesaurusExtract, request_type=IPyAMSLayer, - permission='thesaurus.extract.manage', renderer='json', xhr=True) + permission=MANAGE_THESAURUS_EXTRACT_PERMISSION, renderer='json', xhr=True) class ThesaurusExtractAJAXEditForm(AJAXEditForm, ThesaurusExtractEditForm): """Thesaurus extract edit form, AJAX view""" @@ -259,7 +261,7 @@ @view_config(name='get-nodes.json', context=IThesaurusExtract, request_type=IPyAMSLayer, - permission='view', renderer='json', xhr=True) + permission=VIEW_PERMISSION, renderer='json', xhr=True) class ThesaurusTermNodes(BaseTreeNodesView): """Get thesaurus nodes""" @@ -277,7 +279,7 @@ @view_config(name='delete-extract.json', context=IThesaurusExtracts, request_type=IPyAMSLayer, - permission='thesaurus.admin', renderer='json', xhr=True) + permission=ADMIN_THESAURUS_PERMISSION, renderer='json', xhr=True) def delete_extract(request): """Delete extract from thesaurus""" translate = request.localizer.translate