feat(recyclebin): refactor delete actions to utilize centralized recycle bin messaging

Author: rohnsha0

src/plone/app/content/browser/actions.py

@@ -2,7 +2,9 @@
 from Acquisition import aq_inner
 from Acquisition import aq_parent
 from OFS.CopySupport import CopyError
+from plone.app.content.utils import get_recycle_bin_message
 from plone.base import PloneMessageFactory as _
+from plone.base.interfaces.recyclebin import IRecycleBin
 from plone.base.utils import get_user_friendly_types
 from plone.base.utils import safe_text
 from plone.locking.interfaces import ILockable
@@ -21,7 +23,6 @@
 from zope.component import getMultiAdapter
 from zope.component import queryMultiAdapter
 from zope.component import queryUtility
-from zope.component.hooks import getSite
 from zope.container.interfaces import INameChooser
 from zope.event import notify
 from zope.interface import Interface
@@ -90,32 +91,16 @@ def handle_delete(self, action):
             parent.manage_delObjects(self.context.getId())
 
             # Check if recycle bin is enabled and show appropriate message
-            try:
-                recyclebin_enabled_view = getMultiAdapter(
-                    (getSite(), self.request), name="recyclebin-enabled"
-                )
-                recycling_enabled = recyclebin_enabled_view()
-            except Exception:
-                recycling_enabled = False
+            recycle_bin = queryUtility(IRecycleBin)
+            recycling_enabled = recycle_bin.is_enabled() if recycle_bin else False
 
             if recycling_enabled:
-                # Get retention period from registry (default to 30 days if not found)
+                # Get retention period from registry
                 registry = queryUtility(IRegistry)
-                retention_period = 30  # default
-                if registry is not None:
-                    try:
-                        retention_period = registry.get(
-                            "recyclebin-controlpanel.retention_period", 30
-                        )
-                    except Exception:
-                        retention_period = 30
+                retention_period = registry["recyclebin-controlpanel.retention_period"]
 
-                IStatusMessage(self.request).add(
-                    _(
-                        "${title} has been moved to the recycle bin. It can be restored by administrators and will be permanently deleted after ${days} days.",
-                        mapping={"title": title, "days": retention_period},
-                    )
-                )
+                message = get_recycle_bin_message(title=title, retention_period=retention_period)
+                IStatusMessage(self.request).add(message)
             else:
                 IStatusMessage(self.request).add(
                     _("${title} has been deleted.", mapping={"title": title})

src/plone/app/content/browser/contents/delete.py

@@ -1,8 +1,10 @@
 from AccessControl import Unauthorized
 from AccessControl.Permissions import delete_objects
 from plone.app.content.browser.contents import ContentsBaseAction
+from plone.app.content.utils import get_recycle_bin_message
 from plone.app.content.interfaces import IStructureAction
 from plone.base import PloneMessageFactory as _
+from plone.base.interfaces.recyclebin import IRecycleBin
 from plone.locking.interfaces import ILockable
 from plone.registry.interfaces import IRegistry
 from Products.CMFCore.utils import getToolByName
@@ -51,30 +53,17 @@ class DeleteActionView(ContentsBaseAction):
     def success_msg(self):
         """Dynamic success message that includes recycle bin information."""
         # Check if recycle bin is enabled
-        try:
-            recyclebin_enabled_view = getMultiAdapter(
-                (getSite(), self.request), name="recyclebin-enabled"
-            )
-            recycling_enabled = recyclebin_enabled_view()
-        except Exception:
-            recycling_enabled = False
+        recycle_bin = queryUtility(IRecycleBin)
+        recycling_enabled = recycle_bin.is_enabled() if recycle_bin else False
 
         if not recycling_enabled:
             return _("Successfully deleted items")
 
-        # Get retention period from registry (default to 30 days if not found)
+        # Get retention period from registry
         registry = queryUtility(IRegistry)
-        retention_period = 30  # default
-        if registry is not None:
-            try:
-                retention_period = registry.get("recyclebin-controlpanel.retention_period", 30)
-            except Exception:
-                retention_period = 30
+        retention_period = registry["recyclebin-controlpanel.retention_period"]
 
-        return _(
-            "Successfully moved items to recycle bin. Items can be restored by administrators and will be permanently deleted after ${days} days.",
-            mapping={"days": retention_period},
-        )
+        return get_recycle_bin_message(retention_period=retention_period)
 
     def __call__(self):
         if self.request.form.get("render") == "yes":

src/plone/app/content/utils.py

@@ -40,3 +40,38 @@ def json_dumps(data):
 
 # can eventually provide custom handling here if we want
 json_loads = simplejson.loads
+
+
+def get_recycle_bin_message(title=None, retention_period=0):
+    """Generate appropriate message for recycled items based on retention period.
+    
+    Args:
+        title: The title of the deleted item (optional, for single item messages)
+        retention_period: Number of days to retain items (0 = indefinite)
+    
+    Returns:
+        Translated message string
+    """
+    from plone.base import PloneMessageFactory as _
+    
+    if title:
+        # Single item message
+        if retention_period == 0:
+            return _(
+                "${title} has been moved to the recycle bin. It can be restored by administrators.",
+                mapping={"title": title},
+            )
+        else:
+            return _(
+                "${title} has been moved to the recycle bin. It can be restored by administrators and will be permanently deleted after ${days} days.",
+                mapping={"title": title, "days": retention_period},
+            )
+    else:
+        # Multiple items message
+        if retention_period == 0:
+            return _("Successfully moved items to recycle bin. Items can be restored by administrators.")
+        else:
+            return _(
+                "Successfully moved items to recycle bin. Items can be restored by administrators and will be permanently deleted after ${days} days.",
+                mapping={"days": retention_period},
+            )