src/pyams_portal/zmi/layout.py
changeset 40 71ff4ade6995
parent 17 3f879876f7a6
child 52 067a2341b526
--- a/src/pyams_portal/zmi/layout.py	Wed Jul 12 12:23:32 2017 +0200
+++ b/src/pyams_portal/zmi/layout.py	Wed Jul 12 12:24:05 2017 +0200
@@ -25,7 +25,6 @@
 from pyams_skin.interfaces import IInnerPage, IPageHeader
 from pyams_skin.interfaces.viewlet import IToolbarAddingMenu, IMenuHeader
 from pyams_skin.layer import IPyAMSLayer
-from pyams_utils.interfaces import VIEW_SYSTEM_PERMISSION
 from pyams_zmi.interfaces.menu import IPropertiesMenu, IContentManagementMenu
 from pyams_zmi.layer import IAdminLayer
 from transaction.interfaces import ITransactionManager
@@ -69,7 +68,7 @@
 
 
 @viewlet_config(name='template-properties.menu', context=IPortalTemplate, layer=IAdminLayer,
-                manager=IContentManagementMenu, permission=VIEW_SYSTEM_PERMISSION, weight=1)
+                manager=IContentManagementMenu, permission=MANAGE_TEMPLATE_PERMISSION, weight=1)
 @viewletmanager_config(name='template-properties.menu', layer=IAdminLayer, provides=IPropertiesMenu)
 @implementer(IPropertiesMenu)
 class PortalTemplatePropertiesMenu(MenuItem):
@@ -80,7 +79,8 @@
     url = '#properties.html'
 
 
-@pagelet_config(name='properties.html', context=IPortalTemplate, layer=IPyAMSLayer, permission=VIEW_SYSTEM_PERMISSION)
+@pagelet_config(name='properties.html', context=IPortalTemplate, layer=IPyAMSLayer,
+                permission=MANAGE_TEMPLATE_PERMISSION)
 @template_config(template='templates/layout.pt', layer=IAdminLayer)
 @implementer(IInnerPage)
 class PortalTemplateLayoutView(AdminView):
@@ -271,7 +271,7 @@
 
 
 @view_config(name='get-slots-width.json', context=IPortalTemplate, request_type=IPyAMSLayer,
-             permission=VIEW_SYSTEM_PERMISSION, renderer='json', xhr=True)
+             permission=MANAGE_TEMPLATE_PERMISSION, renderer='json', xhr=True)
 def get_template_slots_width(request):
     """Get template slots width"""
     config = IPortalTemplateConfiguration(request.context)
@@ -290,7 +290,7 @@
 
 
 @pagelet_config(name='slot-properties.html', context=IPortalTemplate, layer=IPyAMSLayer,
-                permission=VIEW_SYSTEM_PERMISSION)
+                permission=MANAGE_TEMPLATE_PERMISSION)
 class PortalTemplateSlotPropertiesEditForm(AdminDialogEditForm):
     """Slot properties edit form"""
 
@@ -444,7 +444,7 @@
 
 
 @view_config(name='portlet-properties.html', context=IPortalTemplate, request_type=IPyAMSLayer,
-             permission=VIEW_SYSTEM_PERMISSION)
+             permission=MANAGE_TEMPLATE_PERMISSION)
 class PortalTemplatePortletEditForm(AdminDialogEditForm):
     """Portal template portlet edit form"""
 
@@ -496,7 +496,7 @@
         changes = editor()
         translate = self.request.localizer.translate
         if changed_override or changes:
-            # we commit before loading previewer to avoid BLOBs "uncommited changes" error
+            # we commit before loading previewer to avoid BLOBs "uncommitted changes" error
             ITransactionManager(self.context).commit()
             previewer = request.registry.queryMultiAdapter((self.context, request, self, portlet_config.settings),
                                                            IPortletPreviewer)
@@ -506,6 +506,7 @@
                                 'message': translate(self.successMessage),
                                 'callback': 'PyAMS_portal.template.editPortletCallback',
                                 'options': {'portlet_id': portlet_id,
+                                            'inherit_parent': portlet_config.inherit_parent,
                                             'preview': previewer.render()}})
         return changes