From 497055bc2e3d4fe44c442407e1e2c620dcb23e4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Fern=C3=A1ndez=20de=20Alba?= Date: Thu, 23 Nov 2023 16:43:21 +0100 Subject: [PATCH 1/5] Add `preview_image` and `preview_image_link` to the list of smart fields for resolveuid and link integrity (#1735) * Add preview_image and preview_image_link to the list of smart fields for resolveuid and link_integrity * Changelog --- news/1735.feature | 2 ++ src/plone/restapi/blocks_linkintegrity.py | 3 +-- src/plone/restapi/deserializer/blocks.py | 2 +- src/plone/restapi/serializer/blocks.py | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 news/1735.feature diff --git a/news/1735.feature b/news/1735.feature new file mode 100644 index 0000000000..b56d324536 --- /dev/null +++ b/news/1735.feature @@ -0,0 +1,2 @@ +Added preview_image and preview_image_link to the list of smart fields for resolveuid and link integrity +[sneridagh] diff --git a/src/plone/restapi/blocks_linkintegrity.py b/src/plone/restapi/blocks_linkintegrity.py index f6c365dd86..5a907baa67 100644 --- a/src/plone/restapi/blocks_linkintegrity.py +++ b/src/plone/restapi/blocks_linkintegrity.py @@ -57,7 +57,6 @@ def __call__(self, block): @adapter(IBlocks, IBrowserRequest) @implementer(IBlockFieldLinkIntegrityRetriever) class SlateBlockLinksRetriever: - order = 100 block_type = "slate" field = "value" @@ -111,7 +110,7 @@ def __call__(self, block): Returns a list of internal links """ links = [] - for field in ["url", "href"]: + for field in ["url", "href", "preview_image", "preview_image_link"]: value = block.get(field, "") for url in get_urls_from_value(value): links.append(url) diff --git a/src/plone/restapi/deserializer/blocks.py b/src/plone/restapi/deserializer/blocks.py index a4746eb4b6..655805903f 100644 --- a/src/plone/restapi/deserializer/blocks.py +++ b/src/plone/restapi/deserializer/blocks.py @@ -55,7 +55,7 @@ class ResolveUIDDeserializerBase: order = 1 block_type = None - fields = ["url", "href"] + fields = ["url", "href", "preview_image", "preview_image_link"] disabled = os.environ.get("disable_transform_resolveuid", False) def __init__(self, context, request): diff --git a/src/plone/restapi/serializer/blocks.py b/src/plone/restapi/serializer/blocks.py index 5a87335804..76669b7092 100644 --- a/src/plone/restapi/serializer/blocks.py +++ b/src/plone/restapi/serializer/blocks.py @@ -40,7 +40,7 @@ def __call__(self): class ResolveUIDSerializerBase: order = 1 block_type = None - fields = ["url", "href"] + fields = ["url", "href", "preview_image", "preview_image_link"] disabled = os.environ.get("disable_transform_resolveuid", False) def __init__(self, context, request): From a266fbb7150623782ca911ef88bf8815e71c0565 Mon Sep 17 00:00:00 2001 From: Timo Stollenwerk Date: Thu, 23 Nov 2023 20:37:11 +0100 Subject: [PATCH 2/5] Prepare changelog entries --- news/1732.internal | 2 +- news/1735.feature | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/news/1732.internal b/news/1732.internal index 3918aa8762..bee7d58993 100644 --- a/news/1732.internal +++ b/news/1732.internal @@ -1 +1 @@ -Does not test in Python 3.7. @wesleybl +Does not test Python 3.7. @wesleybl diff --git a/news/1735.feature b/news/1735.feature index b56d324536..3c47543f7b 100644 --- a/news/1735.feature +++ b/news/1735.feature @@ -1,2 +1 @@ -Added preview_image and preview_image_link to the list of smart fields for resolveuid and link integrity -[sneridagh] +Added preview_image and preview_image_link to the list of smart fields for resolveuid and link integrity. @sneridagh From db3863ce28d4f11a4fc19e1337d7824ac19fce54 Mon Sep 17 00:00:00 2001 From: Timo Stollenwerk Date: Thu, 23 Nov 2023 20:37:33 +0100 Subject: [PATCH 3/5] Preparing release 9.2.0 --- CHANGES.rst | 16 ++++++++++++++++ news/1732.internal | 1 - news/1733.internal | 1 - news/1735.feature | 1 - setup.py | 2 +- 5 files changed, 17 insertions(+), 4 deletions(-) delete mode 100644 news/1732.internal delete mode 100644 news/1733.internal delete mode 100644 news/1735.feature diff --git a/CHANGES.rst b/CHANGES.rst index 59b10c7866..422aadf761 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -8,6 +8,22 @@ Changelog .. towncrier release notes start +9.2.0 (2023-11-23) +------------------ + +New features: + + +- Added preview_image and preview_image_link to the list of smart fields for resolveuid and link integrity. @sneridagh (#1735) + + +Internal: + + +- Does not test Python 3.7. @wesleybl (#1732) +- Use plone.recipe.precompiler to generate mo files to test. @wesleybl (#1733) + + 9.1.2 (2023-11-04) ------------------ diff --git a/news/1732.internal b/news/1732.internal deleted file mode 100644 index bee7d58993..0000000000 --- a/news/1732.internal +++ /dev/null @@ -1 +0,0 @@ -Does not test Python 3.7. @wesleybl diff --git a/news/1733.internal b/news/1733.internal deleted file mode 100644 index 747c61c06f..0000000000 --- a/news/1733.internal +++ /dev/null @@ -1 +0,0 @@ -Use plone.recipe.precompiler to generate mo files to test. @wesleybl diff --git a/news/1735.feature b/news/1735.feature deleted file mode 100644 index 3c47543f7b..0000000000 --- a/news/1735.feature +++ /dev/null @@ -1 +0,0 @@ -Added preview_image and preview_image_link to the list of smart fields for resolveuid and link integrity. @sneridagh diff --git a/setup.py b/setup.py index 4607b9e95b..bb0579a7dd 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ import sys -version = "9.1.3.dev0" +version = "9.2.0" if sys.version_info.major == 2: raise ValueError( From b8070ce7434fa8481d7568ac3ec1b14954b07095 Mon Sep 17 00:00:00 2001 From: Timo Stollenwerk Date: Thu, 23 Nov 2023 20:38:25 +0100 Subject: [PATCH 4/5] Back to development: 9.2.1 --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index bb0579a7dd..11b8001ec7 100644 --- a/setup.py +++ b/setup.py @@ -4,7 +4,7 @@ import sys -version = "9.2.0" +version = "9.2.1.dev0" if sys.version_info.major == 2: raise ValueError( From d5b83a67b5a894b7985c67e6c2ae0c9eb1034fd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=ADctor=20Fern=C3=A1ndez=20de=20Alba?= Date: Mon, 27 Nov 2023 02:17:43 +0100 Subject: [PATCH 5/5] Remove wrong `preview_image_link` addition from blocks (de)serializers (#1737) * Remove wrong `preview_image_link` addition from blocks (de)serializers * Changelog * Remove last one --- news/1737.bugfix | 2 ++ src/plone/restapi/blocks_linkintegrity.py | 2 +- src/plone/restapi/deserializer/blocks.py | 2 +- src/plone/restapi/serializer/blocks.py | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 news/1737.bugfix diff --git a/news/1737.bugfix b/news/1737.bugfix new file mode 100644 index 0000000000..a4953486ab --- /dev/null +++ b/news/1737.bugfix @@ -0,0 +1,2 @@ +Remove wrong `preview_image_link` addition from blocks (de)serializers +[sneridagh] diff --git a/src/plone/restapi/blocks_linkintegrity.py b/src/plone/restapi/blocks_linkintegrity.py index 5a907baa67..754f5c256b 100644 --- a/src/plone/restapi/blocks_linkintegrity.py +++ b/src/plone/restapi/blocks_linkintegrity.py @@ -110,7 +110,7 @@ def __call__(self, block): Returns a list of internal links """ links = [] - for field in ["url", "href", "preview_image", "preview_image_link"]: + for field in ["url", "href", "preview_image"]: value = block.get(field, "") for url in get_urls_from_value(value): links.append(url) diff --git a/src/plone/restapi/deserializer/blocks.py b/src/plone/restapi/deserializer/blocks.py index 655805903f..59e26a807c 100644 --- a/src/plone/restapi/deserializer/blocks.py +++ b/src/plone/restapi/deserializer/blocks.py @@ -55,7 +55,7 @@ class ResolveUIDDeserializerBase: order = 1 block_type = None - fields = ["url", "href", "preview_image", "preview_image_link"] + fields = ["url", "href", "preview_image"] disabled = os.environ.get("disable_transform_resolveuid", False) def __init__(self, context, request): diff --git a/src/plone/restapi/serializer/blocks.py b/src/plone/restapi/serializer/blocks.py index 76669b7092..e255ff7449 100644 --- a/src/plone/restapi/serializer/blocks.py +++ b/src/plone/restapi/serializer/blocks.py @@ -40,7 +40,7 @@ def __call__(self): class ResolveUIDSerializerBase: order = 1 block_type = None - fields = ["url", "href", "preview_image", "preview_image_link"] + fields = ["url", "href", "preview_image"] disabled = os.environ.get("disable_transform_resolveuid", False) def __init__(self, context, request):