diff -r b1c575e3b4aa -r ad63fa80bb49 src/pyams_content/component/links/zmi/__init__.py --- a/src/pyams_content/component/links/zmi/__init__.py Fri Oct 05 15:13:58 2018 +0200 +++ b/src/pyams_content/component/links/zmi/__init__.py Mon Oct 08 11:53:54 2018 +0200 @@ -12,35 +12,29 @@ __docformat__ = 'restructuredtext' - -# import standard library +from z3c.form import field +from zope.interface import implementer -# import interfaces from pyams_content.component.association.interfaces import IAssociationContainer +from pyams_content.component.association.zmi import AssociationItemAJAXAddForm, AssociationItemAJAXEditForm from pyams_content.component.association.zmi.interfaces import IAssociationsView -from pyams_content.component.links.interfaces import ILinkContainerTarget, IBaseLink, IInternalLink, \ - IExternalLink, IMailtoLink +from pyams_content.component.links import ExternalLink, InternalLink, MailtoLink +from pyams_content.component.links.interfaces import IExternalLink, IInternalLink, ILinkContainerTarget, IMailtoLink +from pyams_content.component.paragraph.zmi import get_json_paragraph_markers_refresh_event +from pyams_content.component.paragraph.zmi.container import ParagraphContainerCounterBase from pyams_content.component.paragraph.zmi.interfaces import IParagraphContainerTable, IParagraphTitleToolbar from pyams_content.interfaces import MANAGE_CONTENT_PERMISSION -from pyams_skin.interfaces.viewlet import IToolbarAddingMenu -from pyams_skin.layer import IPyAMSLayer -from pyams_utils.interfaces import VIEW_SYSTEM_PERMISSION -from pyams_zmi.interfaces import IPropertiesEditForm - -# import packages -from pyams_content.component.association.zmi import AssociationItemAJAXAddForm, AssociationItemAJAXEditForm -from pyams_content.component.links import InternalLink, ExternalLink, MailtoLink -from pyams_content.component.paragraph.zmi import get_json_paragraph_markers_refresh_event -from pyams_content.component.paragraph.zmi.container import ParagraphContainerCounterBase from pyams_content.reference.pictograms.zmi.widget import PictogramSelectFieldWidget from pyams_form.form import ajax_config from pyams_form.security import ProtectedFormObjectMixin from pyams_pagelet.pagelet import pagelet_config +from pyams_skin.interfaces.viewlet import IToolbarAddingMenu +from pyams_skin.layer import IPyAMSLayer from pyams_skin.viewlet.toolbar import ToolbarMenuItem +from pyams_utils.interfaces import VIEW_SYSTEM_PERMISSION from pyams_viewlet.viewlet import viewlet_config from pyams_zmi.form import AdminDialogAddForm, AdminDialogEditForm -from z3c.form import field -from zope.interface import implementer +from pyams_zmi.interfaces import IPropertiesEditForm from pyams_content import _ @@ -127,8 +121,7 @@ edit_permission = None # defined by IFormContextPermissionChecker adapter def get_ajax_output(self, changes): - if ('title' in changes.get(IBaseLink, ())) or \ - ('reference' in changes.get(IInternalLink, ())): + if changes: return self.get_associations_table() else: return super(self.__class__, self).get_ajax_output(changes) @@ -216,8 +209,7 @@ edit_permission = None # defined by IFormContextPermissionChecker adapter def get_ajax_output(self, changes): - if ('title' in changes.get(IBaseLink, ())) or \ - ('url' in changes.get(IExternalLink, ())): + if changes: return self.get_associations_table() else: return super(self.__class__, self).get_ajax_output(changes) @@ -304,7 +296,7 @@ edit_permission = None # defined by IFormContextPermissionChecker adapter def get_ajax_output(self, changes): - if ('title' in changes.get(IBaseLink, ())) or changes.get(IMailtoLink, ()): + if changes: return self.get_associations_table() else: return super(self.__class__, self).get_ajax_output(changes)