From ec52adca8f7c71cffdbaeca27a0afc79da7b426e Mon Sep 17 00:00:00 2001 From: ale-rt Date: Wed, 27 May 2026 17:27:57 +0200 Subject: [PATCH] Proposals 1. move templates to the templates folder 2. move as less code as possible (see https://github.com/plone/plone.app.linkintegrity/pull/116) Refs. https://github.com/plone/Products.CMFPlone/issues/3953 --- .../app/layout/controlpanels/configure.zcml | 3 ++- .../app/layout/controlpanels/linkintegrity.py | 24 +------------------ .../linkintegrity_delete_confirmation_info.pt | 0 .../{ => templates}/linkintegrity_update.pt | 0 4 files changed, 3 insertions(+), 24 deletions(-) rename src/plone/app/layout/controlpanels/{ => templates}/linkintegrity_delete_confirmation_info.pt (100%) rename src/plone/app/layout/controlpanels/{ => templates}/linkintegrity_update.pt (100%) diff --git a/src/plone/app/layout/controlpanels/configure.zcml b/src/plone/app/layout/controlpanels/configure.zcml index 2f0da21e..370d65c1 100644 --- a/src/plone/app/layout/controlpanels/configure.zcml +++ b/src/plone/app/layout/controlpanels/configure.zcml @@ -16,8 +16,9 @@ name="updateLinkIntegrityInformation" for="plone.base.interfaces.IPloneSiteRoot" class=".linkintegrity.UpdateView" - template="linkintegrity_update.pt" + template="templates/linkintegrity_update.pt" permission="cmf.ManagePortal" + layer="plone.app.layout.interfaces.IPloneAppLayoutLayer" /> diff --git a/src/plone/app/layout/controlpanels/linkintegrity.py b/src/plone/app/layout/controlpanels/linkintegrity.py index 36d33247..0e6c7135 100644 --- a/src/plone/app/layout/controlpanels/linkintegrity.py +++ b/src/plone/app/layout/controlpanels/linkintegrity.py @@ -21,29 +21,7 @@ class DeleteConfirmationInfo(DeleteConfirmationInfoAPI): - template = ViewPageTemplateFile("linkintegrity_delete_confirmation_info.pt") - breach_count = {} - - def __init__(self, context, request): - self.linkintegrity_enabled = linkintegrity_enabled() - self.context = context - self.request = request - - def __call__(self, items=None): - if not self.linkintegrity_enabled: - return - if items is None: - if IPloneSiteRoot.providedBy(self.context): - # Checking the portal for breaches makes no sense. - return - else: - items = [self.context] - self.breaches = self.get_breaches(items) - return self.template() - - def objects(self): - return [_("Objects in all"), _("Folders"), _("Published objects")] - + template = ViewPageTemplateFile("templates/linkintegrity_delete_confirmation_info.pt") class UpdateView(BrowserView): """Iterate over all catalogued items and update linkintegrity-information.""" diff --git a/src/plone/app/layout/controlpanels/linkintegrity_delete_confirmation_info.pt b/src/plone/app/layout/controlpanels/templates/linkintegrity_delete_confirmation_info.pt similarity index 100% rename from src/plone/app/layout/controlpanels/linkintegrity_delete_confirmation_info.pt rename to src/plone/app/layout/controlpanels/templates/linkintegrity_delete_confirmation_info.pt diff --git a/src/plone/app/layout/controlpanels/linkintegrity_update.pt b/src/plone/app/layout/controlpanels/templates/linkintegrity_update.pt similarity index 100% rename from src/plone/app/layout/controlpanels/linkintegrity_update.pt rename to src/plone/app/layout/controlpanels/templates/linkintegrity_update.pt