From d7a114e0858ab4c59414b2d7fe8812b865e85c24 Mon Sep 17 00:00:00 2001 From: Mauro Amico Date: Fri, 23 Aug 2024 13:44:45 +0200 Subject: [PATCH] =?UTF-8?q?remove=20newsitem=20template=20override,=20use?= =?UTF-8?q?=20default=20dexterity=20view=20for=20new=E2=80=A6=20(#110)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * remove newsitem template override, use default dexterity view for newsitem in backend * black * zpretty * tests * tests --- .github/workflows/tests.yml | 4 ++ CHANGES.rst | 3 ++ src/redturtle/volto/browser/configure.zcml | 10 ++++ src/redturtle/volto/browser/item.pt | 50 +++++++++++++++++++ ...contenttypes.browser.templates.newsitem.pt | 22 -------- src/redturtle/volto/interfaces.py | 5 +- test_plone60.cfg | 1 + 7 files changed, 72 insertions(+), 23 deletions(-) create mode 100644 src/redturtle/volto/browser/item.pt delete mode 100644 src/redturtle/volto/browser/overrides/plone.app.contenttypes.browser.templates.newsitem.pt diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 4d9c4d14..61378643 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -15,6 +15,10 @@ jobs: plone: ["52", "60"] tz: ["UTC", "Europe/Rome"] exclude: + - python: "3.8" + plone: "60" + - python: "3.9" + plone: "52" - python: "3.10" plone: "52" - python: "3.11" diff --git a/CHANGES.rst b/CHANGES.rst index 6eadab4d..f3edaf24 100644 --- a/CHANGES.rst +++ b/CHANGES.rst @@ -20,6 +20,9 @@ Changelog 5.5.0 (2024-07-10) ------------------ +- remove newsitem template override, use default dexterity view for newsitem in backend + [mamico] + - Fixed limit event occurrences to 100. [eikichi18] - Add dependency with collective.volto.sitesettings. diff --git a/src/redturtle/volto/browser/configure.zcml b/src/redturtle/volto/browser/configure.zcml index fc4f259c..4803272e 100644 --- a/src/redturtle/volto/browser/configure.zcml +++ b/src/redturtle/volto/browser/configure.zcml @@ -14,6 +14,16 @@ layer="redturtle.volto.interfaces.IRedturtleVoltoLayer" /> + + + + + + + +

+ +

+ + +
+ +
+
+
+ + +
+ +
+ +
+
+
+
+ + + + + diff --git a/src/redturtle/volto/browser/overrides/plone.app.contenttypes.browser.templates.newsitem.pt b/src/redturtle/volto/browser/overrides/plone.app.contenttypes.browser.templates.newsitem.pt deleted file mode 100644 index aec8c90b..00000000 --- a/src/redturtle/volto/browser/overrides/plone.app.contenttypes.browser.templates.newsitem.pt +++ /dev/null @@ -1,22 +0,0 @@ - - - - - -
- - - - - diff --git a/src/redturtle/volto/interfaces.py b/src/redturtle/volto/interfaces.py index c2b9906f..54d377f1 100644 --- a/src/redturtle/volto/interfaces.py +++ b/src/redturtle/volto/interfaces.py @@ -1,9 +1,12 @@ # -*- coding: utf-8 -*- +# from zope.publisher.interfaces.browser import IDefaultBrowserLayer +from plone.app.contenttypes.interfaces import ( + IPloneAppContenttypesLayer as IDefaultBrowserLayer, +) from plone.dexterity.interfaces import IDexterityContent from plone.restapi.controlpanels.interfaces import IControlpanel from redturtle.volto import _ from zope.interface import Interface -from zope.publisher.interfaces.browser import IDefaultBrowserLayer from zope.schema import Bool diff --git a/test_plone60.cfg b/test_plone60.cfg index ca0dc12d..c0e79122 100644 --- a/test_plone60.cfg +++ b/test_plone60.cfg @@ -17,6 +17,7 @@ mccabe = 0.7.0 plone.recipe.codeanalysis = 3.0.1 pycodestyle = 2.10.0 pyflakes = 3.0.1 +docutils = 0.21.2 plone.stringinterp = 2.0.0 # plone.restapi >= 9.6.1 don't put subjects into SearchableText (to investigate) plone.restapi = 9.6.0