# HG changeset patch # User Thierry Florac # Date 1517921795 -3600 # Node ID b21d74ececb1772595d4c10537dfd28fcff8f16f # Parent d959b670cbe1f25e6abb509c59cf43adeb5e6135 Added checks on responsive images diff -r d959b670cbe1 -r b21d74ececb1 src/pyams_content/component/extfile/__init__.py --- a/src/pyams_content/component/extfile/__init__.py Tue Feb 06 11:39:00 2018 +0100 +++ b/src/pyams_content/component/extfile/__init__.py Tue Feb 06 13:56:35 2018 +0100 @@ -22,7 +22,7 @@ IExtMedia from pyams_content.features.checker.interfaces import IContentChecker, MISSING_VALUE, MISSING_LANG_VALUE from pyams_content.shared.common.interfaces import IWfSharedContent -from pyams_file.interfaces import IFileInfo, IResponsiveImage, DELETED_FILE +from pyams_file.interfaces import IFileInfo, IImage, IResponsiveImage from pyams_i18n.interfaces import II18n, INegotiator, II18nManager from zope.lifecycleevent.interfaces import IObjectAddedEvent, IObjectModifiedEvent, IObjectRemovedEvent @@ -230,7 +230,7 @@ def data(self, value): self._data = value for data in value.values(): - if (data is not None) and (data is not DELETED_FILE): + if IImage.providedBy(data): alsoProvides(data, IResponsiveImage) register_file_factory('image', ExtImage, _("Image")) diff -r d959b670cbe1 -r b21d74ececb1 src/pyams_content/component/gallery/file.py --- a/src/pyams_content/component/gallery/file.py Tue Feb 06 11:39:00 2018 +0100 +++ b/src/pyams_content/component/gallery/file.py Tue Feb 06 13:56:35 2018 +0100 @@ -19,7 +19,7 @@ from pyams_content.component.gallery.interfaces import IGalleryFile from pyams_content.features.checker.interfaces import IContentChecker, MISSING_VALUE, MISSING_LANG_VALUE from pyams_content.shared.common.interfaces import IWfSharedContent -from pyams_file.interfaces import DELETED_FILE, IResponsiveImage +from pyams_file.interfaces import DELETED_FILE, IResponsiveImage, IImage from pyams_form.interfaces.form import IFormContextPermissionChecker from pyams_i18n.interfaces import II18n, II18nManager, INegotiator from zope.lifecycleevent.interfaces import IObjectAddedEvent, IObjectModifiedEvent, IObjectRemovedEvent @@ -67,7 +67,7 @@ @data.setter def data(self, value): self._data = value - if (value is not None) and (value is not DELETED_FILE): + if IImage.providedBy(value): alsoProvides(self._data, IResponsiveImage) diff -r d959b670cbe1 -r b21d74ececb1 src/pyams_content/component/illustration/__init__.py --- a/src/pyams_content/component/illustration/__init__.py Tue Feb 06 11:39:00 2018 +0100 +++ b/src/pyams_content/component/illustration/__init__.py Tue Feb 06 13:56:35 2018 +0100 @@ -19,7 +19,7 @@ from pyams_content.component.illustration.interfaces import IIllustrationRenderer, IIllustration, IIllustrationTarget, \ ILLUSTRATION_KEY from pyams_content.features.checker.interfaces import IContentChecker, MISSING_VALUE, MISSING_LANG_VALUE -from pyams_file.interfaces import DELETED_FILE, IResponsiveImage, IFileInfo +from pyams_file.interfaces import IFileInfo, IImage, IResponsiveImage from pyams_i18n.interfaces import INegotiator, II18n, II18nManager from zope.annotation.interfaces import IAnnotations from zope.lifecycleevent.interfaces import IObjectAddedEvent, IObjectModifiedEvent @@ -68,7 +68,7 @@ def data(self, value): self._data = value for data in value.values(): - if (data is not None) and (data is not DELETED_FILE): + if IImage.providedBy(data): alsoProvides(data, IResponsiveImage)