diff -r 48c1ee485dc0 -r 9b93fdd5ba30 src/pyams_content/shared/site/zmi/link.py --- a/src/pyams_content/shared/site/zmi/link.py Fri Nov 13 13:11:29 2020 +0100 +++ b/src/pyams_content/shared/site/zmi/link.py Fri Nov 13 13:13:48 2020 +0100 @@ -10,18 +10,21 @@ # FOR A PARTICULAR PURPOSE. # +from pyams_content import _ + __docformat__ = 'restructuredtext' from uuid import uuid4 from z3c.form import field from z3c.form.browser.checkbox import SingleCheckBoxFieldWidget -from zope.interface import Interface, implementer +from zope.interface import implementer from zope.intid.interfaces import IIntIds from zope.schema import Int from pyams_content.interfaces import CREATE_CONTENT_PERMISSION, MANAGE_CONTENT_PERMISSION -from pyams_content.shared.site.interfaces import IContentLink, IExternalContentLink, ISiteContainer +from pyams_content.shared.site.interfaces import IContentLink, IExternalContentLink, \ + ISiteContainer from pyams_content.shared.site.link import ContentLink, ExternalContentLink from pyams_content.shared.site.zmi.container import SiteContainerTreeTable from pyams_content.shared.site.zmi.widget import SiteManagerFoldersSelectorFieldWidget @@ -45,11 +48,10 @@ from pyams_zmi.interfaces import IPropertiesEditForm from pyams_zmi.layer import IAdminLayer -from pyams_content import _ - -@viewlet_config(name='add-link.divider', context=ISiteContainer, layer=IAdminLayer, view=Interface, - manager=IToolbarAddingMenu, permission=CREATE_CONTENT_PERMISSION, weight=49) +@viewlet_config(name='add-link.divider', context=ISiteContainer, layer=IAdminLayer, + view=ISiteTreeTable, manager=IToolbarAddingMenu, + permission=CREATE_CONTENT_PERMISSION, weight=49) class AddLinkMenuDivider(MenuDivider): """Add links menu divider""" @@ -58,8 +60,9 @@ # Content link views # -@viewlet_config(name='add-content-link.menu', context=ISiteContainer, layer=IAdminLayer, view=Interface, - manager=IToolbarAddingMenu, permission=CREATE_CONTENT_PERMISSION, weight=50) +@viewlet_config(name='add-content-link.menu', context=ISiteContainer, layer=IAdminLayer, + view=ISiteTreeTable, manager=IToolbarAddingMenu, + permission=CREATE_CONTENT_PERMISSION, weight=50) class ContentLinkAddMenu(ToolbarMenuItem): """Content link add menu""" @@ -79,14 +82,16 @@ @pagelet_config(name='add-content-link.html', context=ISiteContainer, layer=IPyAMSLayer, permission=CREATE_CONTENT_PERMISSION) -@ajax_config(name='add-content-link.json', context=ISiteContainer, layer=IPyAMSLayer, base=AJAXAddForm) +@ajax_config(name='add-content-link.json', context=ISiteContainer, layer=IPyAMSLayer, + base=AJAXAddForm) class ContentLinkAddForm(AdminDialogAddForm): """Content link add form""" legend = _("Rent existing content") - fields = field.Fields(IContentLinkAddFormFields).select('reference', 'navigation_title', 'show_header', - 'navigation_header', 'parent') + fields = field.Fields(IContentLinkAddFormFields).select('reference', 'navigation_title', + 'show_header', 'navigation_header', + 'parent') fields['show_header'].widgetFactory = SingleCheckBoxFieldWidget fields['parent'].widgetFactory = SiteManagerFoldersSelectorFieldWidget @@ -166,7 +171,8 @@ legend = _("Edit content link properties") - fields = field.Fields(IContentLink).select('reference', 'navigation_title', 'show_header', 'navigation_header') + fields = field.Fields(IContentLink).select('reference', 'navigation_title', + 'show_header', 'navigation_header') fields['show_header'].widgetFactory = SingleCheckBoxFieldWidget edit_permission = MANAGE_CONTENT_PERMISSION @@ -199,7 +205,8 @@ 'event': 'myams.refresh', 'options': { 'handler': 'MyAMS.skin.refreshRow', - 'object_id': '{0}::{1}'.format(SiteContainerTreeTable.id, intids.queryId(self.context)), + 'object_id': '{0}::{1}'.format(SiteContainerTreeTable.id, + intids.queryId(self.context)), 'row': table.renderRow(row) } }) @@ -210,8 +217,9 @@ # External content link views # -@viewlet_config(name='add-external-link.menu', context=ISiteContainer, layer=IAdminLayer, view=Interface, - manager=IToolbarAddingMenu, permission=CREATE_CONTENT_PERMISSION, weight=60) +@viewlet_config(name='add-external-link.menu', context=ISiteContainer, layer=IAdminLayer, + view=ISiteTreeTable, manager=IToolbarAddingMenu, + permission=CREATE_CONTENT_PERMISSION, weight=60) class ExternalContentLinkAddMenu(ToolbarMenuItem): """External content link add menu""" @@ -231,13 +239,15 @@ @pagelet_config(name='add-external-link.html', context=ISiteContainer, layer=IPyAMSLayer, permission=CREATE_CONTENT_PERMISSION) -@ajax_config(name='add-external-link.json', context=ISiteContainer, layer=IPyAMSLayer, base=AJAXAddForm) +@ajax_config(name='add-external-link.json', context=ISiteContainer, layer=IPyAMSLayer, + base=AJAXAddForm) class ExternalContentLinkAddForm(AdminDialogAddForm): """External content link add form""" legend = _("Link external content") - fields = field.Fields(IExternalContentLinkAddFormFields).select('url', 'navigation_title', 'show_header', + fields = field.Fields(IExternalContentLinkAddFormFields).select('url', 'navigation_title', + 'show_header', 'navigation_header', 'parent') fields['parent'].widgetFactory = SiteManagerFoldersSelectorFieldWidget @@ -277,7 +287,8 @@ return {'status': 'reload'} -@adapter_config(context=(IExternalContentLink, IPyAMSLayer, ISiteTreeTable), provides=ITableElementName) +@adapter_config(context=(IExternalContentLink, IPyAMSLayer, ISiteTreeTable), + provides=ITableElementName) class ExternalContentLinkTableElementName(ContextRequestViewAdapter): """External content link table element name""" @@ -302,7 +313,8 @@ legend = _("Edit external content link properties") dialog_class = 'modal-large' - fields = field.Fields(IExternalContentLink).select('url', 'navigation_title', 'navigation_header') + fields = field.Fields(IExternalContentLink).select('url', 'navigation_title', + 'navigation_header') edit_permission = MANAGE_CONTENT_PERMISSION def updateWidgets(self, prefix=None): @@ -321,7 +333,8 @@ 'event': 'myams.refresh', 'options': { 'handler': 'MyAMS.skin.refreshRow', - 'object_id': '{0}::{1}'.format(SiteContainerTreeTable.id, intids.queryId(self.context)), + 'object_id': '{0}::{1}'.format(SiteContainerTreeTable.id, + intids.queryId(self.context)), 'row': table.renderRow(row) } })