From 69390cb779a2a2ad21bd5db819eb26841d5fbe66 Mon Sep 17 00:00:00 2001 From: davisagli Date: Wed, 11 Sep 2024 20:06:13 -0700 Subject: [PATCH] [fc] Repository: plone.restapi Branch: refs/heads/main Date: 2024-09-11T20:06:13-07:00 Author: Maurits van Rees (mauritsvanrees) Commit: https://github.com/plone/plone.restapi/commit/057c59a04d4cb2e5d51e83cdab41b7e921aaae88 Fix error getting allow_discussion when p.a.discussion is not activated. (#1808) * Fix error getting allow_discussion value when p.a.discussion is not activated. This fixes an error in Plone 6.1 when the `plone.app.discussion` package is available but not activated in the Add-ons. Problem is that the `conversation_view` is only defined when the browser layer of `plone.app.discussion` is found. Sample error: ``` Traceback (innermost last): Module ZPublisher.WSGIPublisher, line 181, in transaction_pubevents Module ZPublisher.WSGIPublisher, line 391, in publish_module Module ZPublisher.WSGIPublisher, line 285, in publish Module ZPublisher.mapply, line 98, in mapply Module ZPublisher.WSGIPublisher, line 68, in call_object Module plone.rest.service, line 21, in __call__ Module plone.restapi.services, line 19, in render Module plone.restapi.services.content.get, line 16, in reply Module plone.restapi.serializer.dxcontent, line 179, in __call__ Module plone.restapi.serializer.dxcontent, line 142, in __call__ Module plone.restapi.serializer.dxcontent, line 48, in get_allow_discussion_value Module zope.component._api, line 113, in getMultiAdapter zope.interface.interfaces.ComponentLookupError: ((<FolderishDocument at /PloneVolto/page>, <WSGIRequest, URL=http://localhost:8080/PloneVolto/++api++/page/GET_application_json_>), <InterfaceClass zope.interface.Interface>, 'conversation_view') ``` * Fix tests: Plone Site now gets allow_discussion false instead of null. Files changed: A news/1808.bugfix M src/plone/restapi/serializer/dxcontent.py M src/plone/restapi/tests/http-examples/jwt_logged_in.resp M src/plone/restapi/tests/http-examples/navroot_site_get.resp M src/plone/restapi/tests/http-examples/navroot_standard_site_content_get.resp M src/plone/restapi/tests/http-examples/navroot_standard_site_content_get_expansion.resp M src/plone/restapi/tests/http-examples/navroot_standard_site_get.resp M src/plone/restapi/tests/http-examples/navroot_standard_site_get_expansion.resp M src/plone/restapi/tests/http-examples/site_get_expand_navroot.resp M src/plone/restapi/tests/http-examples/siteroot.resp --- last_commit.txt | 96 +++++++++++++++++++++++++------------------------ 1 file changed, 49 insertions(+), 47 deletions(-) diff --git a/last_commit.txt b/last_commit.txt index 75862ec056..389a44bf43 100644 --- a/last_commit.txt +++ b/last_commit.txt @@ -1,50 +1,52 @@ -Repository: plone.app.event - - -Branch: refs/heads/master -Date: 2024-09-06T12:41:14+02:00 -Author: Yuri (yurj) -Commit: https://github.com/plone/plone.app.event/commit/c87af95b3b19da9625e2d526ae2b5f8e65de9f31 - -Update event_summary.pt - -If the name is None, display the mail. Otherwise, a person icon with no useful info is displayed. - -Files changed: -M plone/app/event/browser/event_summary.pt - -b'diff --git a/plone/app/event/browser/event_summary.pt b/plone/app/event/browser/event_summary.pt\nindex ffc11d49..b715c119 100644\n--- a/plone/app/event/browser/event_summary.pt\n+++ b/plone/app/event/browser/event_summary.pt\n@@ -140,7 +140,7 @@\n