From 7c1ea3071554703ba7c3e1cd1706fa27077bc636 Mon Sep 17 00:00:00 2001
From: Adam McNevin <miknevinas@gmail.com>
Date: Fri, 9 Feb 2024 09:25:30 -1000
Subject: [PATCH 01/20] Remove 'Edit Dashboard' link

---
 castle/cms/fragments/templates/dashboard-welcome.pt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/castle/cms/fragments/templates/dashboard-welcome.pt b/castle/cms/fragments/templates/dashboard-welcome.pt
index 91a357b64..b8d03b383 100644
--- a/castle/cms/fragments/templates/dashboard-welcome.pt
+++ b/castle/cms/fragments/templates/dashboard-welcome.pt
@@ -22,7 +22,6 @@
  </div>
   <p class="welcome-message">
     What do you need to do today?<br/>
-    (<a href="${dutils/site/absolute_url}/dashboards/${userId}/edit">Edit dashboard</a>)
   </p>
 
   <ul class="castle-grid-block-sm-6 dashboard-add-content-buttons"

From 9d444ee0c3d3325672adb3af8c753e9ed19190ec Mon Sep 17 00:00:00 2001
From: Adam McNevin <miknevinas@gmail.com>
Date: Mon, 12 Feb 2024 07:49:41 -1000
Subject: [PATCH 02/20] Remove dashboard header icons

---
 .../fragments/templates/dashboard-welcome.pt  | 73 -------------------
 1 file changed, 73 deletions(-)

diff --git a/castle/cms/fragments/templates/dashboard-welcome.pt b/castle/cms/fragments/templates/dashboard-welcome.pt
index b8d03b383..4912f759e 100644
--- a/castle/cms/fragments/templates/dashboard-welcome.pt
+++ b/castle/cms/fragments/templates/dashboard-welcome.pt
@@ -1,6 +1,5 @@
 <div tal:define="dutils context/@@dashboard-utils;
                  totals dutils/get_totals|nothing;
-                 interests dutils/find_areas_of_interest|nothing;
                  memberinfo context/portal_membership/getMemberInfo;
                  member context/@@plone_portal_state/member;
                  userId python: member.getId() or member.getId();
@@ -24,78 +23,6 @@
     What do you need to do today?<br/>
   </p>
 
-  <ul class="castle-grid-block-sm-6 dashboard-add-content-buttons"
-      tal:condition="python: not interests and dutils.has_add_permission">
-    <!-- This should be dynamically generated -->
-    <li class="castle-grid-block-item">
-      <a href="${context/absolute_url}"
-         class="add-content-btn contenttype-document"
-         data-type="Document"
-         data-path="/">Add page</a></li>
-    <li class="castle-grid-block-item">
-      <a href="${context/absolute_url}"
-         class="add-content-btn contenttype-news-item"
-         data-type="News Item"
-         data-path="/">Add news item</a></li>
-    <li class="castle-grid-block-item">
-      <a href="${context/absolute_url}"
-         class="add-content-btn contenttype-link"
-         data-type="Link"
-         data-path="/">Add link</a></li>
-    <li class="castle-grid-block-item">
-      <a href="${context/absolute_url}"
-         class="add-content-btn contenttype-folder"
-         data-type="Folder"
-         data-path="/">Add folder</a></li>
-    <li class="castle-grid-block-item">
-      <a href="${context/absolute_url}"
-         class="upload-content-btn glyphicon glyphicon-upload"
-         data-type="upload">Add files</a></li>
-    <li class="castle-grid-block-item">
-      <a href="${portal_url}/folder_contents" class="icon-manage-site">Manage content</a></li>
-  </ul>
-  <ul class="castle-grid-block-sm-6 dashboard-add-content-buttons" tal:condition="interests">
-    <tal:int tal:repeat="interest interests">
-      <tal:defs tal:define="root python: dutils.is_root(interest['loc']);
-                            type interest/type">
-      <li class="castle-grid-block-item"
-          tal:condition="python: type not in ('UPLOAD', 'MANAGE')">
-        <a href="${context/absolute_url}"
-           class="add-content-btn
-                  contenttype-${python: type.lower().replace(' ', '-')}"
-           tal:condition="root"
-           data-type="${python: interest['type']}"
-           data-path="/">Add ${python: interest['pt'].title.lower()}</a>
-        <a href="${python: interest['loc']}"
-           class="add-content-btn
-                  contenttype-${python: type.lower().replace(' ', '-')}"
-            tal:condition="not: root"
-            data-type="${type}"
-            data-path="${python: dutils.get_path(interest['loc'])}">
-          Add ${python: interest['pt'].title.lower()}
-          <span class="path">to ${python: dutils.get_path(interest['loc'])}</span>
-        </a>
-      </li>
-      <li class="castle-grid-block-item"
-          tal:condition="python: type == 'UPLOAD'">
-        <a href="#" class="upload-content-btn glyphicon glyphicon-upload"
-           data-type="upload">Add files</a>
-      </li>
-      <li class="castle-grid-block-item"
-          tal:condition="python: type == 'MANAGE'"
-          tal:define="root python: dutils.is_root(interest['loc'])">
-        <a href="${portal_url}/folder_contents" tal:condition="root"
-           class="icon-manage-site manage-content-btn">Manage site content</a>
-        <a href="${interest/loc/absolute_url}/folder_contents" tal:condition="not: root"
-           class="icon-manage-site manage-content-btn">
-          Manage
-          <span class="path">${python: dutils.get_path(interest['loc'])}</span>
-        </a>
-      </li>
-    </tal:defs>
-    </tal:int>
-  </ul>
-
   <div class="content-totals" tal:condition="totals" style="display: none">
     <!-- ignore for now... -->
     <span class="content-totals-label">Content Totals</span>

From f40ab157717f290a3f3a86c03d8e136eefd6adb0 Mon Sep 17 00:00:00 2001
From: Adam McNevin <miknevinas@gmail.com>
Date: Mon, 12 Feb 2024 12:18:14 -1000
Subject: [PATCH 03/20] Add user columns

---
 castle/cms/browser/dashboard.py               | 18 ++++
 .../templates/dashboard-statistics.pt         | 96 ++++++++++++++++++-
 2 files changed, 112 insertions(+), 2 deletions(-)

diff --git a/castle/cms/browser/dashboard.py b/castle/cms/browser/dashboard.py
index fc6b64b94..55a5d5e25 100644
--- a/castle/cms/browser/dashboard.py
+++ b/castle/cms/browser/dashboard.py
@@ -186,6 +186,24 @@ def get_recently_modified(self):
     def get_recently_created(self):
         query = dict(sort_on='created', sort_order='reverse')
         return self._paging(query, 'created')
+    
+    def get_user_modified(self):
+        member = api.user.get_current()
+        query = dict(
+            sort_on='modified', 
+            sort_order='reverse', 
+            modified_by=member.getUserName()
+        )
+        return self._paging(query, 'modified')
+
+    def get_user_created(self):
+        member = api.user.get_current()
+        query = dict(
+            sort_on='modified', 
+            sort_order='reverse', 
+            Creator=member.getUserName()
+        )
+        return self._paging(query, 'created')
 
     def get_in_review(self):
         query = dict(sort_on='modified', review_state='pending', sort_order='reverse')
diff --git a/castle/cms/fragments/templates/dashboard-statistics.pt b/castle/cms/fragments/templates/dashboard-statistics.pt
index 82012c7ee..8f4d1c1f3 100644
--- a/castle/cms/fragments/templates/dashboard-statistics.pt
+++ b/castle/cms/fragments/templates/dashboard-statistics.pt
@@ -4,11 +4,103 @@
                  dummy python: utils.add_resource_on_request('castle-dashboard-statistics');"
      class="castle-dashboard-statistics">
 
+<div class="row castle-statistics-container" style="clear: both">
+  <div class="col-md-6 load-container-modified"
+       tal:attributes="class python: has_unders_review and 'col-md-6 load-container-modified'"
+       tal:define="results dutils/get_user_modified">
+    <h3>My Changes</h3>
+    <div class="recent-activity">
+      <table>
+        <thead>
+          <tr class="dots">
+            <th scope="col">Title</th>
+            <th scope="col">Last modified by</th>
+            <th scope="col">Modified</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tal:item tal:repeat="item results/results">
+            <tr class="dots"
+                tal:attributes="class string:dots state-${item/review_state}">
+              <tal:def tal:define="creator python: dutils.get_modifier(item);
+                                   conttype item/portal_type;
+                                   conttypeLower python:conttype.lower();">
+                <td scope="row">
+                  <a href="${python: dutils.util.get_object_url(item)}"
+                     class="title"
+                     tal:attributes="class string:title type contenttype-${conttypeLower}">${item/Title}</a>
+                </td>
+                <td><div class="creator icon-user">${creator/name_or_id}</div></td>
+                <td>
+                  <div class="date pat-moment icon-events"
+                       data-pat-moment="format:relative"
+                       data-date="${python: item.modified.ISO8601()}">
+                  </div>
+                </td>
+              </tal:def>
+            </tr>
+          </tal:item>
+        </tbody>
+      </table>
+    </div>
+    <button class="plone-btn plone-btn-default load-more"
+            data-name="${results/name}"
+            data-start="${results/start}"
+            data-end="${results/end}"
+            data-total="${results/total}"
+            tal:condition="python: results['total'] > results['end']">Load more</button>
+  </div>
+  <div class="col-md-6 load-container-created"
+       tal:attributes="class python: has_unders_review and 'col-md-6 load-container-created'"
+       tal:define="results dutils/get_user_created">
+    <h3>My Additions</h3>
+    <div class="recent-additions">
+      <table>
+        <thead>
+          <tr class="dots">
+            <th scope="col">Title</th>
+            <th scope="col">Created by</th>
+            <th scope="col">Created</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tal:item tal:repeat="item results/results">
+            <tr class="dots"
+                tal:attributes="class string:dots state-${item/review_state}">
+              <tal:def tal:define="creator python: dutils.get_creator(item);
+                                   conttype item/portal_type;
+                                   conttypeLower python:conttype.lower();">
+                <td scope="row">
+                  <a href="${python: dutils.util.get_object_url(item)}"
+                     class="title"
+                     tal:attributes="class string:title type contenttype-${conttypeLower}">${item/Title}</a>
+                </td>
+                <td><div class="creator icon-user">${creator/name_or_id}</div></td>
+                <td>
+                  <div class="date pat-moment icon-events"
+                       data-pat-moment="format:relative"
+                       data-date="${python: item.created.ISO8601()}">
+                  </div>
+                </td>
+              </tal:def>
+            </tr>
+          </tal:item>
+        </tbody>
+      </table>
+    </div>
+    <button class="plone-btn plone-btn-default load-more"
+            data-name="${results/name}"
+            data-start="${results/start}"
+            data-end="${results/end}"
+            data-total="${results/total}"
+            tal:condition="python: results['total'] > results['end']">Load more</button>
+  </div>
+</div>
 <div class="row castle-statistics-container" style="clear: both">
   <div class="col-md-4 load-container-modified"
        tal:attributes="class python: has_unders_review and 'col-md-4 load-container-modified' or 'col-md-6 load-container-modified'"
        tal:define="results dutils/get_recently_modified">
-    <h3>Changes</h3>
+    <h3>All Changes</h3>
     <div class="recent-activity">
       <table>
         <thead>
@@ -53,7 +145,7 @@
   <div class="col-md-4 load-container-created"
        tal:attributes="class python: has_unders_review and 'col-md-4 load-container-created' or 'col-md-6 load-container-created'"
        tal:define="results dutils/get_recently_created">
-    <h3>Additions</h3>
+    <h3>All Additions</h3>
     <div class="recent-additions">
       <table>
         <thead>

From 757d3bfd73212e16e04f6cea58664dfdd0604f33 Mon Sep 17 00:00:00 2001
From: Adam McNevin <miknevinas@gmail.com>
Date: Fri, 16 Feb 2024 11:01:51 -1000
Subject: [PATCH 04/20] Add 'actors' index to determine actor history for
 objects

---
 castle/cms/browser/dashboard.py                  |  4 ++--
 castle/cms/exportimport/install.py               |  6 ++++--
 .../fragments/templates/dashboard-statistics.pt  |  9 ++++-----
 castle/cms/indexing/configure.zcml               |  1 +
 castle/cms/indexing/indexers.py                  | 16 ++++++++++++++++
 5 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/castle/cms/browser/dashboard.py b/castle/cms/browser/dashboard.py
index 55a5d5e25..93efbd81d 100644
--- a/castle/cms/browser/dashboard.py
+++ b/castle/cms/browser/dashboard.py
@@ -192,14 +192,14 @@ def get_user_modified(self):
         query = dict(
             sort_on='modified', 
             sort_order='reverse', 
-            modified_by=member.getUserName()
+            actors=member.getUserName()
         )
         return self._paging(query, 'modified')
 
     def get_user_created(self):
         member = api.user.get_current()
         query = dict(
-            sort_on='modified', 
+            sort_on='created', 
             sort_order='reverse', 
             Creator=member.getUserName()
         )
diff --git a/castle/cms/exportimport/install.py b/castle/cms/exportimport/install.py
index a7b9149a7..69a788017 100644
--- a/castle/cms/exportimport/install.py
+++ b/castle/cms/exportimport/install.py
@@ -14,7 +14,8 @@
     "hasImage": "BooleanIndex",
     "trashed": "BooleanIndex",
     "has_private_parents": "BooleanIndex",
-    "self_or_child_has_title_description_and_image": "BooleanIndex"
+    "self_or_child_has_title_description_and_image": "BooleanIndex",
+    "actors": "KeywordIndex"
 }
 
 REMOVE_INDEXES = [
@@ -34,7 +35,8 @@
     'image_info',
     'navigation_label',
     'has_private_parents',
-    'self_or_child_has_title_description_and_image'
+    'self_or_child_has_title_description_and_image',
+    'actors'
 ]
 
 REMOVE_METADATA = [
diff --git a/castle/cms/fragments/templates/dashboard-statistics.pt b/castle/cms/fragments/templates/dashboard-statistics.pt
index 8f4d1c1f3..3b51a7aba 100644
--- a/castle/cms/fragments/templates/dashboard-statistics.pt
+++ b/castle/cms/fragments/templates/dashboard-statistics.pt
@@ -5,8 +5,8 @@
      class="castle-dashboard-statistics">
 
 <div class="row castle-statistics-container" style="clear: both">
-  <div class="col-md-6 load-container-modified"
-       tal:attributes="class python: has_unders_review and 'col-md-6 load-container-modified'"
+  <div class="col-md-4 load-container-modified"
+       tal:attributes="class python: has_unders_review and 'col-md-4 load-container-modified' or 'col-md-6 load-container-modified'"
        tal:define="results dutils/get_user_modified">
     <h3>My Changes</h3>
     <div class="recent-activity">
@@ -30,7 +30,6 @@
                      class="title"
                      tal:attributes="class string:title type contenttype-${conttypeLower}">${item/Title}</a>
                 </td>
-                <td><div class="creator icon-user">${creator/name_or_id}</div></td>
                 <td>
                   <div class="date pat-moment icon-events"
                        data-pat-moment="format:relative"
@@ -50,8 +49,8 @@
             data-total="${results/total}"
             tal:condition="python: results['total'] > results['end']">Load more</button>
   </div>
-  <div class="col-md-6 load-container-created"
-       tal:attributes="class python: has_unders_review and 'col-md-6 load-container-created'"
+  <div class="col-md-4 load-container-created"
+       tal:attributes="class python: has_unders_review and 'col-md-4 load-container-created' or 'col-md-6 load-container-created'"
        tal:define="results dutils/get_user_created">
     <h3>My Additions</h3>
     <div class="recent-additions">
diff --git a/castle/cms/indexing/configure.zcml b/castle/cms/indexing/configure.zcml
index 93f82b9f7..87b5fb29c 100644
--- a/castle/cms/indexing/configure.zcml
+++ b/castle/cms/indexing/configure.zcml
@@ -42,5 +42,6 @@
   <adapter name="last_modified_by" factory=".indexers.last_modified_by" />
   <adapter name="image_info" factory=".indexers.image_info" />
   <adapter name="has_custom_markup" factory=".indexers.has_custom_markup" />
+  <adapter name="actors" factory=".indexers.actors" />
 
 </configure>
diff --git a/castle/cms/indexing/indexers.py b/castle/cms/indexing/indexers.py
index fa49f9786..50ad91078 100644
--- a/castle/cms/indexing/indexers.py
+++ b/castle/cms/indexing/indexers.py
@@ -216,3 +216,19 @@ def self_or_child_has_title_description_and_image(obj):
 def has_custom_markup(image):
     if image.custom_markup:
         return True
+    
+
+@indexer(IItem)
+def actors(context):
+    actors_list = []
+
+    rt = api.portal.get_tool("portal_repository")
+    history = rt.getHistoryMetadata(context)
+    
+    for i in range(history.getLength(countPurged=False)):
+        data = history.retrieve(i, countPurged=False)
+        actor = data["metadata"]["sys_metadata"]["principal"]
+        actors_list.append(actor) if actor not in actors_list else None
+
+    return actors_list
+

From 8c5c9c47ca345c3fe8d7dfb3f78a16e55d4298c3 Mon Sep 17 00:00:00 2001
From: Adam McNevin <miknevinas@gmail.com>
Date: Tue, 20 Feb 2024 11:10:18 -1000
Subject: [PATCH 05/20] Send email notification when assigned to a view

---
 castle/cms/browser/content/actions.py     | 138 ++++++++++++++++++++++
 castle/cms/browser/content/configure.zcml |   8 ++
 2 files changed, 146 insertions(+)

diff --git a/castle/cms/browser/content/actions.py b/castle/cms/browser/content/actions.py
index 7860eb39c..a41ee5daa 100644
--- a/castle/cms/browser/content/actions.py
+++ b/castle/cms/browser/content/actions.py
@@ -12,6 +12,8 @@
 from castle.cms.utils import is_max_paste_items
 from castle.cms.utils import get_template_repository_info
 from plone.app.content.browser import actions
+from plone.app.workflow.browser import sharing
+from plone.app.workflow.events import LocalrolesModifiedEvent
 from plone.memoize.view import memoize
 from plone.uuid.interfaces import IUUID
 from Products.CMFCore.utils import getToolByName
@@ -19,6 +21,7 @@
 from Products.CMFPlone.utils import safe_unicode
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
 from Products.statusmessages.interfaces import IStatusMessage
+
 from z3c.form import button
 from z3c.form import field
 from z3c.form import form
@@ -26,7 +29,15 @@
 from zope.interface import Interface
 
 import plone.api as api
+import sys
 import zope.schema as schema
+from zope.event import notify
+from zExceptions import Forbidden
+from castle.cms import utils
+import logging
+
+
+logger = logging.getLogger('castle.cms')
 
 
 class ObjectPasteView(actions.ObjectPasteView):
@@ -326,3 +337,130 @@ def do_redirect(self, context):
         utils = Utils(self.context, self.request)
         target = utils.get_object_url(context)
         return self.request.response.redirect(target)
+
+
+class SharingView(sharing.SharingView):
+
+    def __call__(self):
+
+        postback = self.handle_form()
+        if postback:
+            # Reset python recursion limit to baseline if previously raised
+            sys.setrecursionlimit(1000)
+            return self.template()
+        else:
+            context_state = self.context.restrictedTraverse(
+                "@@plone_context_state")
+            url = context_state.view_url()
+            self.request.response.redirect(url)
+
+    def large_count(self):
+        """
+        Displays an alert indicating that we're operating in a view
+        with a high document count, which slows down the process of
+        granting permissions.
+        """
+
+        try:
+            event = LocalrolesModifiedEvent(self.context, self.request)
+            obj = event.object
+            if obj._count:
+                return True if obj._count.value > 1000 else False
+        except AttributeError:
+            return False
+
+    def handle_form(self):
+        """
+        Overrides the 'handle_form' method so we can temporarily increase
+        the python recursion limit if needed.
+
+        Also sends a notification email to individual users assigned to a page.
+        """
+        postback = True
+
+        if bool(self.request.form):
+            try:
+                event = LocalrolesModifiedEvent(self.context, self.request)
+                obj = event.object
+                if obj._count.value > 1000:
+                    # XXX: We're increasing the recursion limit here to prevent the
+                    # 'maximum recursion depth exceeded' error thrown by 'cPickle' 
+                    # that occurs when granting permissions in a large directory 
+                    # (i.e. the 'image-directory')
+                    sys.setrecursionlimit(2000)  
+
+            except AttributeError:
+                # User search form submitted, no need to get count
+                pass
+
+        form = self.request.form
+        submitted = form.get('form.submitted', False)
+        save_button = form.get('form.button.Save', None) is not None
+        cancel_button = form.get('form.button.Cancel', None) is not None
+        if submitted and save_button and not cancel_button:
+            if not self.request.get('REQUEST_METHOD', 'GET') == 'POST':
+                raise Forbidden
+
+            authenticator = self.context.restrictedTraverse('@@authenticator',
+                                                            None)
+            if not authenticator.verify():
+                raise Forbidden
+
+            # Update the acquire-roles setting
+            if self.can_edit_inherit():
+                inherit = bool(form.get('inherit', False))
+                reindex = self.update_inherit(inherit, reindex=False)
+            else:
+                reindex = False
+
+            # Update settings for users and groups
+            entries = form.get('entries', [])
+            roles = [r['id'] for r in self.roles()]
+
+            settings = []
+            for entry in entries:
+                settings.append(
+                    dict(id=entry['id'],
+                         type=entry['type'],
+                         roles=[r for r in roles
+                            if entry.get('role_%s' % r, False)]))
+
+                if entry['type'] == 'user':
+                    # TODO: Should we only send emails for pages/documents?
+                    # Only send emails to individual users
+                    user = api.user.get(entry['id'])
+                    email = user.getProperty('email')
+                    if email:
+                        name = user.getProperty('fullname') or user.getId()
+                        site_path = '/'.join(api.portal.get().getPhysicalPath())
+                        obj_path = '/'.join(obj.getPhysicalPath())[len(site_path):]
+                        try:
+                            # TODO: Should the assigned roles be added to the email as well?
+                            utils.send_email(
+                                recipients=email,
+                                subject="Page Assigned: %s" % (
+                                    api.portal.get_registry_record('plone.site_title')),
+                                html="""
+                                    <p>Hi %s,</p>
+
+                                    <p>You have been assigned a new page:</p>
+                                    <p> %s </p>
+                                    <p>When your task is complete, you may un-assign yourself from this page.</p>""" % (
+                                                name, obj_path))
+                        except Exception:
+                            logger.warn('Could not send page assignment email ', exc_info=True)
+
+            if settings:
+                reindex = self.update_role_settings(settings, reindex=False) \
+                            or reindex
+            if reindex:
+                self.context.reindexObjectSecurity()
+                notify(LocalrolesModifiedEvent(self.context, self.request))
+            IStatusMessage(self.request).addStatusMessage(
+                _(u"Changes saved."), type='info')
+            
+        # Other buttons return to the sharing page
+        if cancel_button:
+            postback = False
+
+        return postback
diff --git a/castle/cms/browser/content/configure.zcml b/castle/cms/browser/content/configure.zcml
index 9f54346ef..53ac53e79 100644
--- a/castle/cms/browser/content/configure.zcml
+++ b/castle/cms/browser/content/configure.zcml
@@ -228,6 +228,14 @@
     template="templates/parallaxview.pt"
   />
 
+  <browser:page
+    for="*"
+    name="sharing"
+    class=".actions.SharingView"
+    permission="cmf.ModifyPortalContent"
+    layer="castle.cms.interfaces.ICastleLayer"
+  />
+
   <adapter
     factory=".actions.default_template_title"
     name="default"

From 249e1429e45ff0a6c856d5ad9d8217d0f03c94ef Mon Sep 17 00:00:00 2001
From: Adam McNevin <miknevinas@gmail.com>
Date: Thu, 22 Feb 2024 08:35:27 -1000
Subject: [PATCH 06/20] Add 'assigned_users' index

---
 castle/cms/browser/dashboard.py               | 13 ++++++++++--
 castle/cms/exportimport/install.py            |  6 ++++--
 .../templates/dashboard-statistics.pt         |  2 +-
 castle/cms/indexing/configure.zcml            |  1 +
 castle/cms/indexing/indexers.py               | 20 ++++++++++++++++---
 5 files changed, 34 insertions(+), 8 deletions(-)

diff --git a/castle/cms/browser/dashboard.py b/castle/cms/browser/dashboard.py
index 93efbd81d..11fbbfa50 100644
--- a/castle/cms/browser/dashboard.py
+++ b/castle/cms/browser/dashboard.py
@@ -194,7 +194,7 @@ def get_user_modified(self):
             sort_order='reverse', 
             actors=member.getUserName()
         )
-        return self._paging(query, 'modified')
+        return self._paging(query, 'user_modified')
 
     def get_user_created(self):
         member = api.user.get_current()
@@ -203,7 +203,16 @@ def get_user_created(self):
             sort_order='reverse', 
             Creator=member.getUserName()
         )
-        return self._paging(query, 'created')
+        return self._paging(query, 'user_created')
+    
+    def get_user_assigned(self):
+        member = api.user.get_current()
+        query = dict(
+            sort_on='created', 
+            sort_order='reverse', 
+            assigned_users=member.getUserName()
+        )
+        return self._paging(query, 'assigned')
 
     def get_in_review(self):
         query = dict(sort_on='modified', review_state='pending', sort_order='reverse')
diff --git a/castle/cms/exportimport/install.py b/castle/cms/exportimport/install.py
index 69a788017..3dad0678d 100644
--- a/castle/cms/exportimport/install.py
+++ b/castle/cms/exportimport/install.py
@@ -15,7 +15,8 @@
     "trashed": "BooleanIndex",
     "has_private_parents": "BooleanIndex",
     "self_or_child_has_title_description_and_image": "BooleanIndex",
-    "actors": "KeywordIndex"
+    "actors": "KeywordIndex",
+    "assigned_users": "KeywordIndex"
 }
 
 REMOVE_INDEXES = [
@@ -36,7 +37,8 @@
     'navigation_label',
     'has_private_parents',
     'self_or_child_has_title_description_and_image',
-    'actors'
+    'actors',
+    'assigned_users'
 ]
 
 REMOVE_METADATA = [
diff --git a/castle/cms/fragments/templates/dashboard-statistics.pt b/castle/cms/fragments/templates/dashboard-statistics.pt
index 3b51a7aba..7866e85a4 100644
--- a/castle/cms/fragments/templates/dashboard-statistics.pt
+++ b/castle/cms/fragments/templates/dashboard-statistics.pt
@@ -30,6 +30,7 @@
                      class="title"
                      tal:attributes="class string:title type contenttype-${conttypeLower}">${item/Title}</a>
                 </td>
+                <td><div class="creator icon-user">${creator/name_or_id}</div></td>
                 <td>
                   <div class="date pat-moment icon-events"
                        data-pat-moment="format:relative"
@@ -94,7 +95,6 @@
             data-total="${results/total}"
             tal:condition="python: results['total'] > results['end']">Load more</button>
   </div>
-</div>
 <div class="row castle-statistics-container" style="clear: both">
   <div class="col-md-4 load-container-modified"
        tal:attributes="class python: has_unders_review and 'col-md-4 load-container-modified' or 'col-md-6 load-container-modified'"
diff --git a/castle/cms/indexing/configure.zcml b/castle/cms/indexing/configure.zcml
index 87b5fb29c..b2c62d20b 100644
--- a/castle/cms/indexing/configure.zcml
+++ b/castle/cms/indexing/configure.zcml
@@ -43,5 +43,6 @@
   <adapter name="image_info" factory=".indexers.image_info" />
   <adapter name="has_custom_markup" factory=".indexers.has_custom_markup" />
   <adapter name="actors" factory=".indexers.actors" />
+  <adapter name="assigned_users" factory=".indexers.actors" />
 
 </configure>
diff --git a/castle/cms/indexing/indexers.py b/castle/cms/indexing/indexers.py
index 50ad91078..a15fde96a 100644
--- a/castle/cms/indexing/indexers.py
+++ b/castle/cms/indexing/indexers.py
@@ -220,7 +220,8 @@ def has_custom_markup(image):
 
 @indexer(IItem)
 def actors(context):
-    actors_list = []
+    # Get history of users that have modified an object
+    actors = []
 
     rt = api.portal.get_tool("portal_repository")
     history = rt.getHistoryMetadata(context)
@@ -228,7 +229,20 @@ def actors(context):
     for i in range(history.getLength(countPurged=False)):
         data = history.retrieve(i, countPurged=False)
         actor = data["metadata"]["sys_metadata"]["principal"]
-        actors_list.append(actor) if actor not in actors_list else None
+        actors.append(actor) if actor not in actors else None
 
-    return actors_list
+    return actors
 
+
+@indexer(IItem)
+def assigned_users(context):
+    # Get local roles for an object
+    # These roles are assigned individually, not inherited
+    assigned_users = []
+
+    acl_users = api.portal.get_tool('acl_users')
+    local_roles = acl_users._getLocalRolesForDisplay(context)
+
+    for name, roles, rtype, rid in local_roles:
+        assigned_users.append(name)
+    return assigned_users

From 681d5dde3b33862be6fcee2effc2f270b8c375e5 Mon Sep 17 00:00:00 2001
From: Adam McNevin <miknevinas@gmail.com>
Date: Thu, 22 Feb 2024 08:36:07 -1000
Subject: [PATCH 07/20] Add 'Assigned Pages' column to dashboard

---
 .../templates/dashboard-statistics.pt         | 46 +++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/castle/cms/fragments/templates/dashboard-statistics.pt b/castle/cms/fragments/templates/dashboard-statistics.pt
index 7866e85a4..fd2640566 100644
--- a/castle/cms/fragments/templates/dashboard-statistics.pt
+++ b/castle/cms/fragments/templates/dashboard-statistics.pt
@@ -95,6 +95,52 @@
             data-total="${results/total}"
             tal:condition="python: results['total'] > results['end']">Load more</button>
   </div>
+  <div class="col-md-4 load-container-created"
+       tal:attributes="class python: has_unders_review and 'col-md-4 load-container-created' or 'col-md-6 load-container-created'"
+       tal:define="results dutils/get_user_assigned">
+    <h3>My Assigned Pages</h3>
+    <div class="recent-additions">
+      <table>
+        <thead>
+          <tr class="dots">
+            <th scope="col">Title</th>
+            <th scope="col">Created by</th>
+            <th scope="col">Created</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tal:item tal:repeat="item results/results">
+            <tr class="dots"
+                tal:attributes="class string:dots state-${item/review_state}">
+              <tal:def tal:define="creator python: dutils.get_creator(item);
+                                   conttype item/portal_type;
+                                   conttypeLower python:conttype.lower();">
+                <td scope="row">
+                  <a href="${python: dutils.util.get_object_url(item)}"
+                     class="title"
+                     tal:attributes="class string:title type contenttype-${conttypeLower}">${item/Title}</a>
+                </td>
+                <td><div class="creator icon-user">${creator/name_or_id}</div></td>
+                <td>
+                  <div class="date pat-moment icon-events"
+                       data-pat-moment="format:relative"
+                       data-date="${python: item.created.ISO8601()}">
+                  </div>
+                </td>
+              </tal:def>
+            </tr>
+          </tal:item>
+        </tbody>
+      </table>
+    </div>
+    <button class="plone-btn plone-btn-default load-more"
+            data-name="${results/name}"
+            data-start="${results/start}"
+            data-end="${results/end}"
+            data-total="${results/total}"
+            tal:condition="python: results['total'] > results['end']">Load more</button>
+  </div>
+</div>
 <div class="row castle-statistics-container" style="clear: both">
   <div class="col-md-4 load-container-modified"
        tal:attributes="class python: has_unders_review and 'col-md-4 load-container-modified' or 'col-md-6 load-container-modified'"

From 262b266022403d6b6f35ca765c8e38ff2c59ed32 Mon Sep 17 00:00:00 2001
From: Adam McNevin <miknevinas@gmail.com>
Date: Fri, 23 Feb 2024 09:26:22 -1000
Subject: [PATCH 08/20] Add 'show/hide' buttons for stats columns

---
 castle/cms/browser/dashboard.py               |   6 +-
 .../templates/dashboard-statistics.pt         | 136 +++++++++++-------
 .../static/components/dashboard-statistics.js |  14 ++
 3 files changed, 101 insertions(+), 55 deletions(-)

diff --git a/castle/cms/browser/dashboard.py b/castle/cms/browser/dashboard.py
index 11fbbfa50..a6436ecee 100644
--- a/castle/cms/browser/dashboard.py
+++ b/castle/cms/browser/dashboard.py
@@ -194,7 +194,7 @@ def get_user_modified(self):
             sort_order='reverse', 
             actors=member.getUserName()
         )
-        return self._paging(query, 'user_modified')
+        return self._paging(query, 'user-modified')
 
     def get_user_created(self):
         member = api.user.get_current()
@@ -203,7 +203,7 @@ def get_user_created(self):
             sort_order='reverse', 
             Creator=member.getUserName()
         )
-        return self._paging(query, 'user_created')
+        return self._paging(query, 'user-created')
     
     def get_user_assigned(self):
         member = api.user.get_current()
@@ -212,7 +212,7 @@ def get_user_assigned(self):
             sort_order='reverse', 
             assigned_users=member.getUserName()
         )
-        return self._paging(query, 'assigned')
+        return self._paging(query, 'user-assigned')
 
     def get_in_review(self):
         query = dict(sort_on='modified', review_state='pending', sort_order='reverse')
diff --git a/castle/cms/fragments/templates/dashboard-statistics.pt b/castle/cms/fragments/templates/dashboard-statistics.pt
index fd2640566..5db42f969 100644
--- a/castle/cms/fragments/templates/dashboard-statistics.pt
+++ b/castle/cms/fragments/templates/dashboard-statistics.pt
@@ -1,15 +1,22 @@
 <div tal:define="dutils context/@@dashboard-utils;
                  under_review dutils/get_in_review;
                  has_unders_review under_review/total;
+                 assigned dutils/get_user_assigned;
+                 has_assigned assigned/total;
                  dummy python: utils.add_resource_on_request('castle-dashboard-statistics');"
      class="castle-dashboard-statistics">
 
 <div class="row castle-statistics-container" style="clear: both">
-  <div class="col-md-4 load-container-modified"
-       tal:attributes="class python: has_unders_review and 'col-md-4 load-container-modified' or 'col-md-6 load-container-modified'"
+  <div class="col-md-4 load-container-user-modified"
+       tal:attributes="class python: has_assigned and 'col-md-4 load-container-user-modified' or 'col-md-6 load-container-user-modified'"
        tal:define="results dutils/get_user_modified">
     <h3>My Changes</h3>
-    <div class="recent-activity">
+    <button type="button" 
+            class="plone-btn plone-btn-default show-hide"
+            data-name="user-activity">
+            Show/Hide
+    </button>
+    <div id="user-activity">
       <table>
         <thead>
           <tr class="dots">
@@ -42,19 +49,24 @@
           </tal:item>
         </tbody>
       </table>
+      <button class="plone-btn plone-btn-default load-more"
+        data-name="${results/name}"
+        data-start="${results/start}"
+        data-end="${results/end}"
+        data-total="${results/total}"
+        tal:condition="python: results['total'] > results['end']">Load more</button>
     </div>
-    <button class="plone-btn plone-btn-default load-more"
-            data-name="${results/name}"
-            data-start="${results/start}"
-            data-end="${results/end}"
-            data-total="${results/total}"
-            tal:condition="python: results['total'] > results['end']">Load more</button>
   </div>
-  <div class="col-md-4 load-container-created"
-       tal:attributes="class python: has_unders_review and 'col-md-4 load-container-created' or 'col-md-6 load-container-created'"
+  <div class="col-md-4 load-container-user-created"
+       tal:attributes="class python: has_assigned and 'col-md-4 load-container-user-created' or 'col-md-6 load-container-user-created'"
        tal:define="results dutils/get_user_created">
     <h3>My Additions</h3>
-    <div class="recent-additions">
+    <button type="button" 
+            class="plone-btn plone-btn-default show-hide"
+            data-name="user-additions">
+            Show/Hide
+    </button>
+    <div id="user-additions">
       <table>
         <thead>
           <tr class="dots">
@@ -87,19 +99,24 @@
           </tal:item>
         </tbody>
       </table>
+      <button class="plone-btn plone-btn-default load-more"
+              data-name="${results/name}"
+              data-start="${results/start}"
+              data-end="${results/end}"
+              data-total="${results/total}"
+              tal:condition="python: results['total'] > results['end']">Load more</button>
     </div>
-    <button class="plone-btn plone-btn-default load-more"
-            data-name="${results/name}"
-            data-start="${results/start}"
-            data-end="${results/end}"
-            data-total="${results/total}"
-            tal:condition="python: results['total'] > results['end']">Load more</button>
   </div>
-  <div class="col-md-4 load-container-created"
-       tal:attributes="class python: has_unders_review and 'col-md-4 load-container-created' or 'col-md-6 load-container-created'"
+  <div class="col-md-4 load-container-user-assigned"
+       tal:condition="has_assigned"
        tal:define="results dutils/get_user_assigned">
     <h3>My Assigned Pages</h3>
-    <div class="recent-additions">
+    <button type="button" 
+            class="plone-btn plone-btn-default show-hide"
+            data-name="user-assigned">
+            Show/Hide
+    </button>
+    <div id="user-assigned">
       <table>
         <thead>
           <tr class="dots">
@@ -132,21 +149,26 @@
           </tal:item>
         </tbody>
       </table>
+      <button class="plone-btn plone-btn-default load-more"
+              data-name="${results/name}"
+              data-start="${results/start}"
+              data-end="${results/end}"
+              data-total="${results/total}"
+              tal:condition="python: results['total'] > results['end']">Load more</button>
     </div>
-    <button class="plone-btn plone-btn-default load-more"
-            data-name="${results/name}"
-            data-start="${results/start}"
-            data-end="${results/end}"
-            data-total="${results/total}"
-            tal:condition="python: results['total'] > results['end']">Load more</button>
   </div>
-</div>
-<div class="row castle-statistics-container" style="clear: both">
+  </div>
+  <div class="row castle-statistics-container" style="clear: both">
   <div class="col-md-4 load-container-modified"
        tal:attributes="class python: has_unders_review and 'col-md-4 load-container-modified' or 'col-md-6 load-container-modified'"
        tal:define="results dutils/get_recently_modified">
-    <h3>All Changes</h3>
-    <div class="recent-activity">
+    <h3>Recent Changes</h3>
+    <button type="button" 
+            class="plone-btn plone-btn-default show-hide"
+            data-name="recent-activity">
+            Show/Hide
+    </button>
+    <div id="recent-activity">
       <table>
         <thead>
           <tr class="dots">
@@ -179,19 +201,24 @@
           </tal:item>
         </tbody>
       </table>
+      <button class="plone-btn plone-btn-default load-more"
+              data-name="${results/name}"
+              data-start="${results/start}"
+              data-end="${results/end}"
+              data-total="${results/total}"
+              tal:condition="python: results['total'] > results['end']">Load more</button>
     </div>
-    <button class="plone-btn plone-btn-default load-more"
-            data-name="${results/name}"
-            data-start="${results/start}"
-            data-end="${results/end}"
-            data-total="${results/total}"
-            tal:condition="python: results['total'] > results['end']">Load more</button>
   </div>
   <div class="col-md-4 load-container-created"
        tal:attributes="class python: has_unders_review and 'col-md-4 load-container-created' or 'col-md-6 load-container-created'"
        tal:define="results dutils/get_recently_created">
-    <h3>All Additions</h3>
-    <div class="recent-additions">
+    <h3>Recent Additions</h3>
+    <button type="button" 
+            class="plone-btn plone-btn-default show-hide"
+            data-name="recent-additions">
+            Show/Hide
+    </button>
+    <div id="recent-additions">
       <table>
         <thead>
           <tr class="dots">
@@ -224,17 +251,22 @@
           </tal:item>
         </tbody>
       </table>
+      <button class="plone-btn plone-btn-default load-more"
+              data-name="${results/name}"
+              data-start="${results/start}"
+              data-end="${results/end}"
+              data-total="${results/total}"
+              tal:condition="python: results['total'] > results['end']">Load more</button>
     </div>
-    <button class="plone-btn plone-btn-default load-more"
-            data-name="${results/name}"
-            data-start="${results/start}"
-            data-end="${results/end}"
-            data-total="${results/total}"
-            tal:condition="python: results['total'] > results['end']">Load more</button>
   </div>
   <div class="col-md-4 load-container-review" tal:condition="has_unders_review">
     <h3>Under Review</h3>
-    <div class="under-review">
+    <button type="button" 
+            class="plone-btn plone-btn-default show-hide"
+            data-name="under-review">
+            Show/Hide
+    </button>
+    <div id="under-review">
       <table>
         <thead>
           <tr class="dots">
@@ -267,13 +299,13 @@
           </tal:item>
         </tbody>
       </table>
+      <button class="plone-btn plone-btn-default load-more"
+              data-name="${under_review/name}"
+              data-start="${under_review/start}"
+              data-end="${under_review/end}"
+              data-total="${under_review/total}"
+              tal:condition="python: under_review['total'] > under_review['end']">Load more</button>
     </div>
-    <button class="plone-btn plone-btn-default load-more"
-            data-name="${under_review/name}"
-            data-start="${under_review/start}"
-            data-end="${under_review/end}"
-            data-total="${under_review/total}"
-            tal:condition="python: under_review['total'] > under_review['end']">Load more</button>
   </div>
 </div>
 </div>
diff --git a/castle/cms/static/components/dashboard-statistics.js b/castle/cms/static/components/dashboard-statistics.js
index c7366477b..11f19c147 100644
--- a/castle/cms/static/components/dashboard-statistics.js
+++ b/castle/cms/static/components/dashboard-statistics.js
@@ -31,4 +31,18 @@ require([
     });
   };
   bind();
+
+  var bindShowHide = function(){
+    $(csel + ' button.show-hide').off('click').on('click', function(e){
+      e.preventDefault();
+      var $btn = $(this);
+      var x = document.getElementById($btn.attr('data-name'));
+      if (x.style.display === "none") {
+        x.style.display = "block";
+      } else {
+        x.style.display = "none";
+      }
+    });
+  };
+  bindShowHide();
 });

From cdb6f41a9dd63f981f650d7e31ec7592e04f964d Mon Sep 17 00:00:00 2001
From: Adam McNevin <miknevinas@gmail.com>
Date: Tue, 27 Feb 2024 09:27:23 -1000
Subject: [PATCH 09/20] Add test cron for workflow reminders

---
 castle/cms/cron/__init__.py           |  4 ++
 castle/cms/cron/_workflow_reminder.py | 80 +++++++++++++++++++++++++++
 setup.py                              |  1 +
 3 files changed, 85 insertions(+)
 create mode 100644 castle/cms/cron/_workflow_reminder.py

diff --git a/castle/cms/cron/__init__.py b/castle/cms/cron/__init__.py
index 9f0449d1e..f0accece2 100644
--- a/castle/cms/cron/__init__.py
+++ b/castle/cms/cron/__init__.py
@@ -122,3 +122,7 @@ def link_report(argv=sys.argv):
 
 def auto_publish_retract(argv=sys.argv):
     return run_it('_auto_publish_retract')
+
+
+def workflow_reminder(argv=sys.argv):
+    return run_it('_workflow_reminder')
diff --git a/castle/cms/cron/_workflow_reminder.py b/castle/cms/cron/_workflow_reminder.py
new file mode 100644
index 000000000..ffdc84f82
--- /dev/null
+++ b/castle/cms/cron/_workflow_reminder.py
@@ -0,0 +1,80 @@
+from AccessControl.SecurityManagement import newSecurityManager
+from DateTime import DateTime
+from plone import api
+from Products.CMFPlone.interfaces.siteroot import IPloneSiteRoot
+from tendo import singleton
+from zope.component.hooks import setSite
+
+import logging
+import transaction
+
+
+logger = logging.getLogger('castle.cms')
+
+
+
+def set_queries(site):
+    setSite(site)
+
+    # publish pending content with an effective date within 30 minutes of cron run
+    start = DateTime(DateTime().timeTime() - (30 * 60))
+    end = DateTime()
+    publish_query = {
+        'modified': {
+            'query': (start, end),
+            'range': 'min:max'
+        },
+    }
+
+    retract_query = {
+        'expires': {
+            'query': DateTime(),
+            'range': 'max'
+        },
+        'review_state': 'published'
+    }
+    catalog = api.portal.get_tool('portal_catalog')
+    content = catalog(**retract_query)
+    
+    print('=== content ===')
+    for brain in content:
+        obj = brain.getObject()
+        print(obj)
+        print(obj.modified())
+
+
+    # if email:
+    #     name = user.getProperty('fullname') or user.getId()
+    #     try:
+    #         utils.send_email(
+    #             recipients=email,
+    #             subject="Paste Operation Failed(Site: %s)" % (
+    #                 api.portal.get_registry_record('plone.site_title')),
+    #             html="""
+    #                 <p>Hi %s,</p>
+
+    #                 <p>The site has failed to paste your items into the /%s folder.</p>
+
+    #                 <p>Please contact your administrator.</p>""" % (
+    #                                     name, where.lstrip('/')))
+    #     except Exception:
+    #         logger.warn('Could not send status email ', exc_info=True)
+
+
+def run(app):
+    singleton.SingleInstance('autopublish')
+
+    user = app.acl_users.getUser('admin')  # noqa
+    newSecurityManager(None, user.__of__(app.acl_users))  # noqa
+
+    for oid in app.objectIds():  # noqa
+        obj = app[oid]  # noqa
+        if IPloneSiteRoot.providedBy(obj):
+            try:
+                set_queries(obj)
+            except Exception:
+                logger.error('Could not update content for %s' % oid, exc_info=True)
+
+
+if __name__ == '__main__':
+    run(app)  # noqa
diff --git a/setup.py b/setup.py
index c130f3bfa..536bf1383 100644
--- a/setup.py
+++ b/setup.py
@@ -135,6 +135,7 @@ def read(*rnames):
       link-report = castle.cms.cron:link_report
       report-users = castle.cms._scripts.report_users:setup_and_run
       auto-publish-retract = castle.cms.cron:auto_publish_retract
+      workflow_reminder = castle.cms.cron:workflow_reminder
       """,
     include_package_data=True,
     zip_safe=False,

From 3f50053c263885987da951e84de9bc09e8a41f8f Mon Sep 17 00:00:00 2001
From: Adam McNevin <miknevinas@gmail.com>
Date: Wed, 28 Feb 2024 08:19:02 -1000
Subject: [PATCH 10/20] Remove CRON, moving to task instead

---
 castle/cms/cron/__init__.py           |  4 --
 castle/cms/cron/_workflow_reminder.py | 80 ---------------------------
 setup.py                              |  1 -
 3 files changed, 85 deletions(-)
 delete mode 100644 castle/cms/cron/_workflow_reminder.py

diff --git a/castle/cms/cron/__init__.py b/castle/cms/cron/__init__.py
index f0accece2..9f0449d1e 100644
--- a/castle/cms/cron/__init__.py
+++ b/castle/cms/cron/__init__.py
@@ -122,7 +122,3 @@ def link_report(argv=sys.argv):
 
 def auto_publish_retract(argv=sys.argv):
     return run_it('_auto_publish_retract')
-
-
-def workflow_reminder(argv=sys.argv):
-    return run_it('_workflow_reminder')
diff --git a/castle/cms/cron/_workflow_reminder.py b/castle/cms/cron/_workflow_reminder.py
deleted file mode 100644
index ffdc84f82..000000000
--- a/castle/cms/cron/_workflow_reminder.py
+++ /dev/null
@@ -1,80 +0,0 @@
-from AccessControl.SecurityManagement import newSecurityManager
-from DateTime import DateTime
-from plone import api
-from Products.CMFPlone.interfaces.siteroot import IPloneSiteRoot
-from tendo import singleton
-from zope.component.hooks import setSite
-
-import logging
-import transaction
-
-
-logger = logging.getLogger('castle.cms')
-
-
-
-def set_queries(site):
-    setSite(site)
-
-    # publish pending content with an effective date within 30 minutes of cron run
-    start = DateTime(DateTime().timeTime() - (30 * 60))
-    end = DateTime()
-    publish_query = {
-        'modified': {
-            'query': (start, end),
-            'range': 'min:max'
-        },
-    }
-
-    retract_query = {
-        'expires': {
-            'query': DateTime(),
-            'range': 'max'
-        },
-        'review_state': 'published'
-    }
-    catalog = api.portal.get_tool('portal_catalog')
-    content = catalog(**retract_query)
-    
-    print('=== content ===')
-    for brain in content:
-        obj = brain.getObject()
-        print(obj)
-        print(obj.modified())
-
-
-    # if email:
-    #     name = user.getProperty('fullname') or user.getId()
-    #     try:
-    #         utils.send_email(
-    #             recipients=email,
-    #             subject="Paste Operation Failed(Site: %s)" % (
-    #                 api.portal.get_registry_record('plone.site_title')),
-    #             html="""
-    #                 <p>Hi %s,</p>
-
-    #                 <p>The site has failed to paste your items into the /%s folder.</p>
-
-    #                 <p>Please contact your administrator.</p>""" % (
-    #                                     name, where.lstrip('/')))
-    #     except Exception:
-    #         logger.warn('Could not send status email ', exc_info=True)
-
-
-def run(app):
-    singleton.SingleInstance('autopublish')
-
-    user = app.acl_users.getUser('admin')  # noqa
-    newSecurityManager(None, user.__of__(app.acl_users))  # noqa
-
-    for oid in app.objectIds():  # noqa
-        obj = app[oid]  # noqa
-        if IPloneSiteRoot.providedBy(obj):
-            try:
-                set_queries(obj)
-            except Exception:
-                logger.error('Could not update content for %s' % oid, exc_info=True)
-
-
-if __name__ == '__main__':
-    run(app)  # noqa
diff --git a/setup.py b/setup.py
index 536bf1383..c130f3bfa 100644
--- a/setup.py
+++ b/setup.py
@@ -135,7 +135,6 @@ def read(*rnames):
       link-report = castle.cms.cron:link_report
       report-users = castle.cms._scripts.report_users:setup_and_run
       auto-publish-retract = castle.cms.cron:auto_publish_retract
-      workflow_reminder = castle.cms.cron:workflow_reminder
       """,
     include_package_data=True,
     zip_safe=False,

From 992ce24e015082011276ed79a73a379e10805772 Mon Sep 17 00:00:00 2001
From: Adam McNevin <miknevinas@gmail.com>
Date: Thu, 29 Feb 2024 11:47:43 -1000
Subject: [PATCH 11/20] Move email notification to task

---
 castle/cms/browser/content/actions.py | 57 +++++++++++++--------
 castle/cms/indexing/indexers.py       |  5 +-
 castle/cms/tasks/email.py             | 74 +++++++++++++++++++++++++++
 3 files changed, 114 insertions(+), 22 deletions(-)

diff --git a/castle/cms/browser/content/actions.py b/castle/cms/browser/content/actions.py
index a41ee5daa..2853b3f2b 100644
--- a/castle/cms/browser/content/actions.py
+++ b/castle/cms/browser/content/actions.py
@@ -11,6 +11,7 @@
 from castle.cms.utils import get_paste_data
 from castle.cms.utils import is_max_paste_items
 from castle.cms.utils import get_template_repository_info
+from castle.cms.tasks.email import send_email_reminder
 from plone.app.content.browser import actions
 from plone.app.workflow.browser import sharing
 from plone.app.workflow.events import LocalrolesModifiedEvent
@@ -33,11 +34,6 @@
 import zope.schema as schema
 from zope.event import notify
 from zExceptions import Forbidden
-from castle.cms import utils
-import logging
-
-
-logger = logging.getLogger('castle.cms')
 
 
 class ObjectPasteView(actions.ObjectPasteView):
@@ -378,6 +374,30 @@ def handle_form(self):
         """
         postback = True
 
+        # print('=== actors ===')
+        # actors = []
+        # rt = api.portal.get_tool("portal_repository")
+        # history = rt.getHistoryMetadata(self.context)
+        # for i in range(history.getLength(countPurged=False)):
+        #     data = history.retrieve(i, countPurged=False)
+        #     actor = data["metadata"]["sys_metadata"]["principal"]
+        #     actors.append(actor) if actor not in actors else None
+        # print(actors)
+
+        # print('=== contributors ===')
+        # assigned_users = []
+
+        # acl_users = api.portal.get_tool('acl_users')
+        # local_roles = acl_users._getLocalRolesForDisplay(self.context)
+
+        # for name, rolesm, rtype, rid in local_roles:
+        #     print(name)
+        #     print(rolesm)
+        #     print(rtype)
+        #     assigned_users.append(name)
+        # print(assigned_users)
+
+
         if bool(self.request.form):
             try:
                 event = LocalrolesModifiedEvent(self.context, self.request)
@@ -431,24 +451,19 @@ def handle_form(self):
                     user = api.user.get(entry['id'])
                     email = user.getProperty('email')
                     if email:
-                        name = user.getProperty('fullname') or user.getId()
+                        name=user.getProperty('fullname') or user.getId()
+                        roles=[r for r in roles if entry.get('role_%s' % r, False)]
                         site_path = '/'.join(api.portal.get().getPhysicalPath())
                         obj_path = '/'.join(obj.getPhysicalPath())[len(site_path):]
-                        try:
-                            # TODO: Should the assigned roles be added to the email as well?
-                            utils.send_email(
-                                recipients=email,
-                                subject="Page Assigned: %s" % (
-                                    api.portal.get_registry_record('plone.site_title')),
-                                html="""
-                                    <p>Hi %s,</p>
-
-                                    <p>You have been assigned a new page:</p>
-                                    <p> %s </p>
-                                    <p>When your task is complete, you may un-assign yourself from this page.</p>""" % (
-                                                name, obj_path))
-                        except Exception:
-                            logger.warn('Could not send page assignment email ', exc_info=True)
+
+                        data = dict(
+                            pid=obj.getId(),
+                            name=name,
+                            email=email,
+                            roles=roles,
+                            obj_path=obj_path
+                        )
+                        send_email_reminder.delay(data)
 
             if settings:
                 reindex = self.update_role_settings(settings, reindex=False) \
diff --git a/castle/cms/indexing/indexers.py b/castle/cms/indexing/indexers.py
index a15fde96a..55b94e4f5 100644
--- a/castle/cms/indexing/indexers.py
+++ b/castle/cms/indexing/indexers.py
@@ -244,5 +244,8 @@ def assigned_users(context):
     local_roles = acl_users._getLocalRolesForDisplay(context)
 
     for name, roles, rtype, rid in local_roles:
-        assigned_users.append(name)
+        if 'Owner' not in roles and rtype == 'user':
+            # 'Owner' indicates a global role assigned by admin
+            # These can only be un-assigned by admin, so we're ignoring them
+            assigned_users.append(name)
     return assigned_users
diff --git a/castle/cms/tasks/email.py b/castle/cms/tasks/email.py
index b19da31af..e5cad5e6b 100644
--- a/castle/cms/tasks/email.py
+++ b/castle/cms/tasks/email.py
@@ -5,6 +5,11 @@
 from plone import api
 from urllib import urlencode
 from zope.globalrequest import getRequest
+from castle.cms import cache
+import logging
+
+
+logger = logging.getLogger('castle.cms')
 
 
 @task.as_admin()
@@ -49,3 +54,72 @@ def send_email_to_subscribers(subject, html, categories=None, sender=None):
         html = html.replace('{{change_url}}', change_url)
 
         utils.send_email([subscriber.get('email')], subject, html, sender=sender)
+
+
+@task.as_admin()
+def send_email_reminder(data=None):
+    """
+    This sends reminder emails to users who have been assigned to a page via the
+    'Sharing' tab.
+    The first email is sent upon initial assignment.
+    The second is sent after five days if they haven't run-assigned themselves 
+    from the page.
+    """
+
+    cache_key = '-'.join(api.portal.get().getPhysicalPath()[1:]) + '-email-reminders'
+    notify_list = []
+
+    try:
+        notify_list = cache.get(cache_key)
+    except KeyError:
+        cache.set(cache_key, notify_list)
+
+    
+    if data:
+        # A user has been assigned to a page
+        # Their info will be added to the cache, and they will receive an email
+
+        notify_list.append(data)
+        cache.set(cache_key, notify_list)
+
+        try:
+            # TODO: Should the assigned roles be added to the email as well?
+            utils.send_email(
+                recipients=data.get('email'),
+                subject="Page Assigned: %s" % (
+                    api.portal.get_registry_record('plone.site_title')),
+                html="""
+                    <p>Hi %s,</p>
+
+                    <p>You have been assigned a new page:</p>
+                    <p> %s </p>
+                    <p>When your task is complete, you may un-assign yourself from this page.</p>""" % (
+                                data.get('name'), data.get('obj_path')))
+        except Exception:
+            logger.warn('Could not send page assignment email ', exc_info=True)
+    
+    else:
+        # CRON run
+        # print('=== actors ===')
+        # actors = []
+        # rt = api.portal.get_tool("portal_repository")
+        # history = rt.getHistoryMetadata(self.context)
+        # for i in range(history.getLength(countPurged=False)):
+        #     data = history.retrieve(i, countPurged=False)
+        #     actor = data["metadata"]["sys_metadata"]["principal"]
+        #     actors.append(actor) if actor not in actors else None
+        # print(actors)
+
+        # print('=== contributors ===')
+        # assigned_users = []
+
+        # acl_users = api.portal.get_tool('acl_users')
+        # local_roles = acl_users._getLocalRolesForDisplay(self.context)
+
+        # for name, rolesm, rtype, rid in local_roles:
+        #     print(name)
+        #     print(rolesm)
+        #     print(rtype)
+        #     assigned_users.append(name)
+        # print(assigned_users)
+        pass

From fbc23706a0833dd47ab51904bf72c2f8c29b30d7 Mon Sep 17 00:00:00 2001
From: Adam McNevin <miknevinas@gmail.com>
Date: Fri, 1 Mar 2024 11:55:32 -1000
Subject: [PATCH 12/20] Add reminder task

---
 castle/cms/browser/content/actions.py |  50 +++++------
 castle/cms/tasks/email.py             | 120 +++++++++++++++-----------
 2 files changed, 89 insertions(+), 81 deletions(-)

diff --git a/castle/cms/browser/content/actions.py b/castle/cms/browser/content/actions.py
index 2853b3f2b..4cae1d7ef 100644
--- a/castle/cms/browser/content/actions.py
+++ b/castle/cms/browser/content/actions.py
@@ -397,22 +397,6 @@ def handle_form(self):
         #     assigned_users.append(name)
         # print(assigned_users)
 
-
-        if bool(self.request.form):
-            try:
-                event = LocalrolesModifiedEvent(self.context, self.request)
-                obj = event.object
-                if obj._count.value > 1000:
-                    # XXX: We're increasing the recursion limit here to prevent the
-                    # 'maximum recursion depth exceeded' error thrown by 'cPickle' 
-                    # that occurs when granting permissions in a large directory 
-                    # (i.e. the 'image-directory')
-                    sys.setrecursionlimit(2000)  
-
-            except AttributeError:
-                # User search form submitted, no need to get count
-                pass
-
         form = self.request.form
         submitted = form.get('form.submitted', False)
         save_button = form.get('form.button.Save', None) is not None
@@ -425,6 +409,19 @@ def handle_form(self):
                                                             None)
             if not authenticator.verify():
                 raise Forbidden
+            
+            event = LocalrolesModifiedEvent(self.context, self.request)
+            obj = event.object
+            try:
+                if obj._count.value > 1000:
+                    # XXX: We're increasing the recursion limit here to prevent the
+                    # 'maximum recursion depth exceeded' error thrown by 'cPickle' 
+                    # that occurs when granting permissions in a large directory 
+                    # (i.e. the 'image-directory')
+                    sys.setrecursionlimit(2000)  
+            except AttributeError:
+                # User search form submitted, no need to get count
+                pass
 
             # Update the acquire-roles setting
             if self.can_edit_inherit():
@@ -439,31 +436,24 @@ def handle_form(self):
 
             settings = []
             for entry in entries:
+                assigned_roles=[r for r in roles if entry.get('role_%s' % r, False)]
                 settings.append(
                     dict(id=entry['id'],
                          type=entry['type'],
-                         roles=[r for r in roles
-                            if entry.get('role_%s' % r, False)]))
+                         roles=assigned_roles))
 
-                if entry['type'] == 'user':
-                    # TODO: Should we only send emails for pages/documents?
-                    # Only send emails to individual users
+                if entry['type'] == 'user' and 'Reviewer' in assigned_roles:
+                    # Only send emails to individual users assigned as 'Reviewers'
                     user = api.user.get(entry['id'])
                     email = user.getProperty('email')
                     if email:
-                        name=user.getProperty('fullname') or user.getId()
-                        roles=[r for r in roles if entry.get('role_%s' % r, False)]
-                        site_path = '/'.join(api.portal.get().getPhysicalPath())
-                        obj_path = '/'.join(obj.getPhysicalPath())[len(site_path):]
-
                         data = dict(
-                            pid=obj.getId(),
-                            name=name,
+                            uid=user.getId(),
+                            name=user.getProperty('fullname') or user.getId(),
                             email=email,
                             roles=roles,
-                            obj_path=obj_path
                         )
-                        send_email_reminder.delay(data)
+                        send_email_reminder.delay(obj, data)
 
             if settings:
                 reindex = self.update_role_settings(settings, reindex=False) \
diff --git a/castle/cms/tasks/email.py b/castle/cms/tasks/email.py
index e5cad5e6b..9029eeaf9 100644
--- a/castle/cms/tasks/email.py
+++ b/castle/cms/tasks/email.py
@@ -6,6 +6,8 @@
 from urllib import urlencode
 from zope.globalrequest import getRequest
 from castle.cms import cache
+from DateTime import DateTime
+from copy import deepcopy
 import logging
 
 
@@ -57,69 +59,85 @@ def send_email_to_subscribers(subject, html, categories=None, sender=None):
 
 
 @task.as_admin()
-def send_email_reminder(data=None):
+def send_email_reminder(obj=None, data=None):
     """
     This sends reminder emails to users who have been assigned to a page via the
     'Sharing' tab.
     The first email is sent upon initial assignment.
-    The second is sent after five days if they haven't run-assigned themselves 
+    The second is sent after five days if they haven't un-assigned themselves 
     from the page.
     """
 
     cache_key = '-'.join(api.portal.get().getPhysicalPath()[1:]) + '-email-reminders'
-    notify_list = []
+    reminder_cache = {}
 
     try:
-        notify_list = cache.get(cache_key)
+        reminder_cache = cache.get(cache_key)
     except KeyError:
-        cache.set(cache_key, notify_list)
+        cache.set(cache_key, reminder_cache)
 
-    
-    if data:
+    if obj:
         # A user has been assigned to a page
-        # Their info will be added to the cache, and they will receive an email
-
-        notify_list.append(data)
-        cache.set(cache_key, notify_list)
-
-        try:
-            # TODO: Should the assigned roles be added to the email as well?
-            utils.send_email(
-                recipients=data.get('email'),
-                subject="Page Assigned: %s" % (
-                    api.portal.get_registry_record('plone.site_title')),
-                html="""
-                    <p>Hi %s,</p>
-
-                    <p>You have been assigned a new page:</p>
-                    <p> %s </p>
-                    <p>When your task is complete, you may un-assign yourself from this page.</p>""" % (
-                                data.get('name'), data.get('obj_path')))
-        except Exception:
-            logger.warn('Could not send page assignment email ', exc_info=True)
-    
+        item_key = obj.getId() + '#' + data['uid']
+        if item_key not in reminder_cache:
+
+            data['pid'] = obj.getId()
+            data['portal_type'] = obj.portal_type
+            data['reminder_date'] = DateTime() + 5
+
+            # Set key as page id + user id so each user/page association can be tracked individually
+            reminder_cache[data['pid'] + '#' + data['uid']] = data
+            cache.set(cache_key, reminder_cache)
+
+            obj_path = obj.getPhysicalPath()
+
+            try:
+                utils.send_email(
+                    recipients=data['email'],
+                    subject="Page Assigned: %s" % (
+                        api.portal.get_registry_record('plone.site_title')),
+                    html="""
+                        <p>Hi %s,</p>
+
+                        <p>You have been assigned a new page:</p>
+                        <p> %s </p>
+                        <p>When your task is complete, you may un-assign yourself from this page.</p>""" % (
+                                    data['name'], obj_path))
+            except Exception:
+                logger.warn('Could not send assignment email ', exc_info=True)
+        else:
+            # Assignment exists in cache
+            if 'Reviewer' not in data['roles']:
+                new_cache = deepcopy(reminder_cache) # Not sure if deepcopy is necessary
+                new_cache.pop(item_key, None)
+                cache.set(cache_key, new_cache)
+
     else:
         # CRON run
-        # print('=== actors ===')
-        # actors = []
-        # rt = api.portal.get_tool("portal_repository")
-        # history = rt.getHistoryMetadata(self.context)
-        # for i in range(history.getLength(countPurged=False)):
-        #     data = history.retrieve(i, countPurged=False)
-        #     actor = data["metadata"]["sys_metadata"]["principal"]
-        #     actors.append(actor) if actor not in actors else None
-        # print(actors)
-
-        # print('=== contributors ===')
-        # assigned_users = []
-
-        # acl_users = api.portal.get_tool('acl_users')
-        # local_roles = acl_users._getLocalRolesForDisplay(self.context)
-
-        # for name, rolesm, rtype, rid in local_roles:
-        #     print(name)
-        #     print(rolesm)
-        #     print(rtype)
-        #     assigned_users.append(name)
-        # print(assigned_users)
-        pass
+        portal_catalog = api.portal.get_tool('portal_catalog')
+
+        for key, item in reminder_cache.items():
+            results = portal_catalog.searchResults({'portal_type': item.get('portal_type'), 'id': item.get('pid')})
+            for brain in results:
+                obj = brain.getObject()
+                roles = obj.get_local_roles_for_userid(item.get('uid'))
+                if 'Reviewer' in roles:
+                    if item.get('reminder_date') < DateTime():
+                        try:
+                            utils.send_email(
+                                recipients=data['email'],
+                                subject="Page Assigned: %s" % (
+                                    api.portal.get_registry_record('plone.site_title')),
+                                html="""
+                                    <p>Hi %s,</p>
+
+                                    <p>You have been assigned a new page:</p>
+                                    <p> %s </p>
+                                    <p>When your task is complete, you may un-assign yourself from this page.</p>""" % (
+                                                data['name'], obj_path))
+                        except Exception:
+                            logger.warn('Could not send assignment email ', exc_info=True)
+                else:
+                    new_cache = deepcopy(reminder_cache) # Not sure if deepcopy is necessary
+                    new_cache.pop(key, None)
+                    cache.set(cache_key, new_cache)

From 958a24a1ef1370cc1926c7a7dec4e9eb2962fd3d Mon Sep 17 00:00:00 2001
From: Adam McNevin <miknevinas@gmail.com>
Date: Fri, 1 Mar 2024 12:13:26 -1000
Subject: [PATCH 13/20] Add CRON for email reminders

---
 castle/cms/cron/__init__.py         |  4 ++
 castle/cms/cron/_email_reminders.py | 75 +++++++++++++++++++++++
 castle/cms/tasks/email.py           | 95 ++++++++++-------------------
 3 files changed, 110 insertions(+), 64 deletions(-)
 create mode 100644 castle/cms/cron/_email_reminders.py

diff --git a/castle/cms/cron/__init__.py b/castle/cms/cron/__init__.py
index 9f0449d1e..9dc617b3e 100644
--- a/castle/cms/cron/__init__.py
+++ b/castle/cms/cron/__init__.py
@@ -122,3 +122,7 @@ def link_report(argv=sys.argv):
 
 def auto_publish_retract(argv=sys.argv):
     return run_it('_auto_publish_retract')
+
+
+def email_reminders(argv=sys.argv):
+    return run_it('_email_reminders')
diff --git a/castle/cms/cron/_email_reminders.py b/castle/cms/cron/_email_reminders.py
new file mode 100644
index 000000000..9bf371543
--- /dev/null
+++ b/castle/cms/cron/_email_reminders.py
@@ -0,0 +1,75 @@
+from AccessControl.SecurityManagement import newSecurityManager
+from DateTime import DateTime
+from plone import api
+from Products.CMFPlone.interfaces.siteroot import IPloneSiteRoot
+from tendo import singleton
+from zope.component.hooks import setSite
+from castle.cms import cache
+from castle.cms import utils
+from copy import deepcopy
+
+import logging
+
+
+logger = logging.getLogger('castle.cms')
+
+
+def send_reminders(site):
+    setSite(site)
+
+    cache_key = '-'.join(api.portal.get().getPhysicalPath()[1:]) + '-email-reminders'
+    reminder_cache = {}
+
+    try:
+        reminder_cache = cache.get(cache_key)
+    except KeyError:
+        cache.set(cache_key, reminder_cache)
+    portal_catalog = api.portal.get_tool('portal_catalog')
+
+    for key, item in reminder_cache.items():
+        results = portal_catalog.searchResults({'portal_type': item.get('portal_type'), 'id': item.get('pid')})
+        for brain in results:
+            obj = brain.getObject()
+            roles = obj.get_local_roles_for_userid(item.get('uid'))
+            if 'Reviewer' in roles:
+                if item.get('reminder_date') < DateTime():
+                    pass
+                    # try:
+                    #     utils.send_email(
+                    #         recipients=data['email'],
+                    #         subject="Page Assigned: %s" % (
+                    #             api.portal.get_registry_record('plone.site_title')),
+                    #         html="""
+                    #             <p>Hi %s,</p>
+
+                    #             <p>You have been assigned a new page:</p>
+                    #             <p> %s </p>
+                    #             <p>When your task is complete, you may un-assign yourself from this page.</p>""" % (
+                    #                         data['name'], obj_path))
+                    # except Exception:
+                    #     logger.warn('Could not send assignment email ', exc_info=True)
+            else:
+                new_cache = deepcopy(reminder_cache) # Not sure if deepcopy is necessary
+                new_cache.pop(key, None)
+                cache.set(cache_key, new_cache)
+        
+    
+
+
+def run(app):
+    singleton.SingleInstance('autopublish')
+
+    user = app.acl_users.getUser('admin')  # noqa
+    newSecurityManager(None, user.__of__(app.acl_users))  # noqa
+
+    for oid in app.objectIds():  # noqa
+        obj = app[oid]  # noqa
+        if IPloneSiteRoot.providedBy(obj):
+            try:
+                send_reminders(obj)
+            except Exception:
+                logger.error('Could not update content for %s' % oid, exc_info=True)
+
+
+if __name__ == '__main__':
+    run(app)  # noqa
\ No newline at end of file
diff --git a/castle/cms/tasks/email.py b/castle/cms/tasks/email.py
index 9029eeaf9..712e6b651 100644
--- a/castle/cms/tasks/email.py
+++ b/castle/cms/tasks/email.py
@@ -59,7 +59,7 @@ def send_email_to_subscribers(subject, html, categories=None, sender=None):
 
 
 @task.as_admin()
-def send_email_reminder(obj=None, data=None):
+def send_email_reminder(obj, data):
     """
     This sends reminder emails to users who have been assigned to a page via the
     'Sharing' tab.
@@ -76,68 +76,35 @@ def send_email_reminder(obj=None, data=None):
     except KeyError:
         cache.set(cache_key, reminder_cache)
 
-    if obj:
-        # A user has been assigned to a page
-        item_key = obj.getId() + '#' + data['uid']
-        if item_key not in reminder_cache:
-
-            data['pid'] = obj.getId()
-            data['portal_type'] = obj.portal_type
-            data['reminder_date'] = DateTime() + 5
-
-            # Set key as page id + user id so each user/page association can be tracked individually
-            reminder_cache[data['pid'] + '#' + data['uid']] = data
-            cache.set(cache_key, reminder_cache)
-
-            obj_path = obj.getPhysicalPath()
-
-            try:
-                utils.send_email(
-                    recipients=data['email'],
-                    subject="Page Assigned: %s" % (
-                        api.portal.get_registry_record('plone.site_title')),
-                    html="""
-                        <p>Hi %s,</p>
-
-                        <p>You have been assigned a new page:</p>
-                        <p> %s </p>
-                        <p>When your task is complete, you may un-assign yourself from this page.</p>""" % (
-                                    data['name'], obj_path))
-            except Exception:
-                logger.warn('Could not send assignment email ', exc_info=True)
-        else:
-            # Assignment exists in cache
-            if 'Reviewer' not in data['roles']:
-                new_cache = deepcopy(reminder_cache) # Not sure if deepcopy is necessary
-                new_cache.pop(item_key, None)
-                cache.set(cache_key, new_cache)
+    item_key = obj.getId() + '#' + data['uid']
+    if item_key not in reminder_cache:
+        data['pid'] = obj.getId()
+        data['portal_type'] = obj.portal_type
+        data['reminder_date'] = DateTime() + 5
 
+        # Set key as page id + user id so each user/page association can be tracked individually
+        reminder_cache[data['pid'] + '#' + data['uid']] = data
+        cache.set(cache_key, reminder_cache)
+
+        obj_path = obj.getPhysicalPath()
+
+        try:
+            utils.send_email(
+                recipients=data['email'],
+                subject="Page Assigned: %s" % (
+                    api.portal.get_registry_record('plone.site_title')),
+                html="""
+                    <p>Hi %s,</p>
+
+                    <p>You have been assigned a new page:</p>
+                    <p> %s </p>
+                    <p>When your task is complete, you may un-assign yourself from this page.</p>""" % (
+                                data['name'], obj_path))
+        except Exception:
+            logger.warn('Could not send assignment email ', exc_info=True)
     else:
-        # CRON run
-        portal_catalog = api.portal.get_tool('portal_catalog')
-
-        for key, item in reminder_cache.items():
-            results = portal_catalog.searchResults({'portal_type': item.get('portal_type'), 'id': item.get('pid')})
-            for brain in results:
-                obj = brain.getObject()
-                roles = obj.get_local_roles_for_userid(item.get('uid'))
-                if 'Reviewer' in roles:
-                    if item.get('reminder_date') < DateTime():
-                        try:
-                            utils.send_email(
-                                recipients=data['email'],
-                                subject="Page Assigned: %s" % (
-                                    api.portal.get_registry_record('plone.site_title')),
-                                html="""
-                                    <p>Hi %s,</p>
-
-                                    <p>You have been assigned a new page:</p>
-                                    <p> %s </p>
-                                    <p>When your task is complete, you may un-assign yourself from this page.</p>""" % (
-                                                data['name'], obj_path))
-                        except Exception:
-                            logger.warn('Could not send assignment email ', exc_info=True)
-                else:
-                    new_cache = deepcopy(reminder_cache) # Not sure if deepcopy is necessary
-                    new_cache.pop(key, None)
-                    cache.set(cache_key, new_cache)
+        # Assignment exists in cache
+        if 'Reviewer' not in data['roles']:
+            new_cache = deepcopy(reminder_cache) # Not sure if deepcopy is necessary
+            new_cache.pop(item_key, None)
+            cache.set(cache_key, new_cache)

From 2ac38bf945eced3b0f63a3b9f6020a5ba513ccaa Mon Sep 17 00:00:00 2001
From: Adam McNevin <miknevinas@gmail.com>
Date: Mon, 4 Mar 2024 06:45:04 -1000
Subject: [PATCH 14/20] Update emails

---
 castle/cms/browser/content/actions.py | 23 ----------------------
 castle/cms/cron/_email_reminders.py   | 28 +++++++++++++--------------
 2 files changed, 14 insertions(+), 37 deletions(-)

diff --git a/castle/cms/browser/content/actions.py b/castle/cms/browser/content/actions.py
index 4cae1d7ef..36eb15c79 100644
--- a/castle/cms/browser/content/actions.py
+++ b/castle/cms/browser/content/actions.py
@@ -374,29 +374,6 @@ def handle_form(self):
         """
         postback = True
 
-        # print('=== actors ===')
-        # actors = []
-        # rt = api.portal.get_tool("portal_repository")
-        # history = rt.getHistoryMetadata(self.context)
-        # for i in range(history.getLength(countPurged=False)):
-        #     data = history.retrieve(i, countPurged=False)
-        #     actor = data["metadata"]["sys_metadata"]["principal"]
-        #     actors.append(actor) if actor not in actors else None
-        # print(actors)
-
-        # print('=== contributors ===')
-        # assigned_users = []
-
-        # acl_users = api.portal.get_tool('acl_users')
-        # local_roles = acl_users._getLocalRolesForDisplay(self.context)
-
-        # for name, rolesm, rtype, rid in local_roles:
-        #     print(name)
-        #     print(rolesm)
-        #     print(rtype)
-        #     assigned_users.append(name)
-        # print(assigned_users)
-
         form = self.request.form
         submitted = form.get('form.submitted', False)
         save_button = form.get('form.button.Save', None) is not None
diff --git a/castle/cms/cron/_email_reminders.py b/castle/cms/cron/_email_reminders.py
index 9bf371543..a75b206bd 100644
--- a/castle/cms/cron/_email_reminders.py
+++ b/castle/cms/cron/_email_reminders.py
@@ -31,23 +31,23 @@ def send_reminders(site):
         for brain in results:
             obj = brain.getObject()
             roles = obj.get_local_roles_for_userid(item.get('uid'))
+            obj_path = obj.getPhysicalPath()
             if 'Reviewer' in roles:
                 if item.get('reminder_date') < DateTime():
-                    pass
-                    # try:
-                    #     utils.send_email(
-                    #         recipients=data['email'],
-                    #         subject="Page Assigned: %s" % (
-                    #             api.portal.get_registry_record('plone.site_title')),
-                    #         html="""
-                    #             <p>Hi %s,</p>
+                    try:
+                        utils.send_email(
+                            recipients=item.get('email'),
+                            subject="Page Assigned: %s" % (
+                                api.portal.get_registry_record('plone.site_title')),
+                            html="""
+                                <p>Hi %s,</p>
 
-                    #             <p>You have been assigned a new page:</p>
-                    #             <p> %s </p>
-                    #             <p>When your task is complete, you may un-assign yourself from this page.</p>""" % (
-                    #                         data['name'], obj_path))
-                    # except Exception:
-                    #     logger.warn('Could not send assignment email ', exc_info=True)
+                                <p>This is a reminder that you have the following page assignment:</p>
+                                <p> %s </p>
+                                <p>When your task is complete, you may un-assign yourself from this page.</p>""" % (
+                                            item.get('name'), obj_path))
+                    except Exception:
+                        logger.warn('Could not send assignment email ', exc_info=True)
             else:
                 new_cache = deepcopy(reminder_cache) # Not sure if deepcopy is necessary
                 new_cache.pop(key, None)

From 6172703ab1cdb0b20862e3849f2355fe9a5cdb73 Mon Sep 17 00:00:00 2001
From: Adam McNevin <miknevinas@gmail.com>
Date: Mon, 4 Mar 2024 11:41:52 -1000
Subject: [PATCH 15/20] Add custom message field to sharing view

---
 castle/cms/browser/content/actions.py         |   2 +
 castle/cms/cron/_email_reminders.py           |  33 ++-
 .../plone.app.workflow.browser.sharing.pt     | 207 ++++++++++++++++++
 castle/cms/tasks/email.py                     |  34 ++-
 4 files changed, 254 insertions(+), 22 deletions(-)
 create mode 100644 castle/cms/jbot_overrides/plone.app.workflow.browser.sharing.pt

diff --git a/castle/cms/browser/content/actions.py b/castle/cms/browser/content/actions.py
index 36eb15c79..16c723fe2 100644
--- a/castle/cms/browser/content/actions.py
+++ b/castle/cms/browser/content/actions.py
@@ -378,6 +378,7 @@ def handle_form(self):
         submitted = form.get('form.submitted', False)
         save_button = form.get('form.button.Save', None) is not None
         cancel_button = form.get('form.button.Cancel', None) is not None
+        message = form.get('message_optional', None)
         if submitted and save_button and not cancel_button:
             if not self.request.get('REQUEST_METHOD', 'GET') == 'POST':
                 raise Forbidden
@@ -429,6 +430,7 @@ def handle_form(self):
                             name=user.getProperty('fullname') or user.getId(),
                             email=email,
                             roles=roles,
+                            message=message
                         )
                         send_email_reminder.delay(obj, data)
 
diff --git a/castle/cms/cron/_email_reminders.py b/castle/cms/cron/_email_reminders.py
index a75b206bd..807f35a0c 100644
--- a/castle/cms/cron/_email_reminders.py
+++ b/castle/cms/cron/_email_reminders.py
@@ -31,21 +31,32 @@ def send_reminders(site):
         for brain in results:
             obj = brain.getObject()
             roles = obj.get_local_roles_for_userid(item.get('uid'))
-            obj_path = obj.getPhysicalPath()
+            obj_path = '/'.join(obj.getPhysicalPath())
             if 'Reviewer' in roles:
                 if item.get('reminder_date') < DateTime():
                     try:
+                        recipients=item['email']
+                        subject="Page Assigned: %s" % (
+                            api.portal.get_registry_record('plone.site_title'))
+                        html="""
+                            <p>Hi %s,</p>
+
+                            <p>You have been assigned a new page:</p>
+                            <p> %s </p>
+                            <p>When your task is complete, you may un-assign yourself from this page.</p>""" % (
+                                        item['name'], obj_path)
+                        message = item.get('message')
+                        if message:
+                            html += """
+
+                            <p> %s </p>
+                            """ % (message)
+                        
                         utils.send_email(
-                            recipients=item.get('email'),
-                            subject="Page Assigned: %s" % (
-                                api.portal.get_registry_record('plone.site_title')),
-                            html="""
-                                <p>Hi %s,</p>
-
-                                <p>This is a reminder that you have the following page assignment:</p>
-                                <p> %s </p>
-                                <p>When your task is complete, you may un-assign yourself from this page.</p>""" % (
-                                            item.get('name'), obj_path))
+                            recipients=recipients,
+                            subject=subject,
+                            html=html
+                        )
                     except Exception:
                         logger.warn('Could not send assignment email ', exc_info=True)
             else:
diff --git a/castle/cms/jbot_overrides/plone.app.workflow.browser.sharing.pt b/castle/cms/jbot_overrides/plone.app.workflow.browser.sharing.pt
new file mode 100644
index 000000000..f7881765b
--- /dev/null
+++ b/castle/cms/jbot_overrides/plone.app.workflow.browser.sharing.pt
@@ -0,0 +1,207 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en"
+      lang="en"
+      metal:use-macro="context/main_template/macros/master"
+      i18n:domain="plone">
+
+<head>
+</head>
+
+<body>
+<metal:main fill-slot="main"
+     tal:define="context_state context/@@plone_context_state;
+                 portal_state context/@@plone_portal_state;
+                 portal portal_state/portal;
+                 portal_url portal_state/portal_url;
+                 checkPermission nocall:context/portal_membership/checkPermission;
+                 can_view_groups python:checkPermission('Plone Site Setup: Users and Groups', portal)">
+
+    <div class="portalMessage info" tal:condition="context_state/is_default_page">
+        <strong i18n:translate="">
+            Info
+        </strong>
+        <span tal:omit-tag="" i18n:translate="help_sharing_page_default_page">
+            You are adjusting the sharing privileges for a default view in a container.
+            To adjust them for the entire container,
+            <a i18n:name="go_here"
+               i18n:translate="help_sharing_go_here"
+               tal:define="folder context_state/folder"
+               tal:attributes="href string:${folder/absolute_url}/sharing">go here</a>.
+        </span>
+    </div>
+
+    <div class="portalMessage warning" tal:condition="view/large_count">
+        <strong i18n:translate="">
+            Warning
+        </strong>
+        <span tal:omit-tag="" i18n:translate="help_sharing_page_default_page">
+            This view contains a large amount of documents. Adjusting user
+            privileges will take longer than usual. 
+        </span>
+    </div>
+
+    <h1 class="documentFirstHeading"
+        i18n:translate="heading_currently_assigned_shares">
+        Sharing for
+        <q tal:content="context/Title" i18n:name="folder">title</q>
+    </h1>
+
+    <div class="documentDescription"
+       i18n:translate="description_sharing_control">
+        You can control who can view and edit your item using the list below.
+    </div>
+
+    <div tal:replace="structure provider:plone.abovecontentbody" tal:condition="not:ajax_load" />
+
+    <div id="content-core">
+        <form method="post"
+              tal:attributes="action string:${context/absolute_url}/@@sharing">
+
+            <input type="hidden" name="form.submitted:boolean" value="True" />
+
+            <div class="field">
+                <input type="text"
+                       id="sharing-user-group-search"
+                       size="30"
+                       name="search_term"
+                       title="Search for user or group"
+                       placeholder="Search for user or group"
+                       i18n:attributes="title; placeholder"
+                       class="searchField"
+                       value=""
+                       />
+                <input type="submit"
+                       id="sharing-search-button"
+                       name="form.button.Search"
+                       value="Search"
+                       class="searchButton allowMultiSubmit"
+                       i18n:attributes="value label_search"
+                       />
+            </div>
+
+        <div id="user-group-sharing-container">
+        <table metal:define-macro="user-group-sharing" id="user-group-sharing"
+               class="listing"
+               summary="Current sharing permissions"
+               tal:define="available_roles view/roles;
+                           num_columns python:len(available_roles) + 1;
+                           role_settings view/role_settings"
+               i18n:attributes="summary summary_assigned_roles;">
+
+              <thead metal:define-macro="user-group-sharing-head" id="user-group-sharing-head">
+                  <tr tal:condition="python:len(role_settings) > 0">
+                      <th i18n:translate="label_name">Name</th>
+                      <th class="nosort"
+                          tal:repeat="role available_roles"
+                          i18n:translate=""
+                          tal:content="role/title"  />
+                  </tr>
+              </thead>
+
+            <tbody metal:define-macro="user-group-sharing-settings" id="user-group-sharing-settings">
+                <tal:entries repeat="entry role_settings">
+                    <tr tal:define="is_group python:entry['type'] == 'group';
+                                    disabled entry/disabled | python:False;
+                                    oddrow repeat/entry/odd;
+                                    sticky python:entry['id'] in view.STICKY"
+                        tal:attributes="class python:oddrow and 'odd' or 'even'">
+                        <td tal:attributes="title entry/id">
+                            <img tal:condition="is_group" tal:replace="structure context/group.png" />
+                            <img tal:condition="not:is_group" tal:replace="structure context/user.png" />
+
+                            <a tal:omit-tag="python:not is_group or not can_view_groups or entry.get('id') == 'AuthenticatedUsers'"
+                               tal:attributes="href string:${portal_url}/@@usergroup-groupmembership?groupname=${entry/id}">
+                            <tal:sticky condition="sticky">
+                              <span tal:replace="entry/title" />
+                            </tal:sticky>
+                            <tal:nonsticky condition="not:sticky">
+                              <span tal:replace="entry/title" />
+                              <tal:title condition="entry/login|nothing">
+                                (<span tal:replace="entry/login" />)
+                              </tal:title>
+                            </tal:nonsticky>
+                            </a>
+
+                            <input
+                                tal:condition="not:disabled"
+                                type="hidden"
+                                name="entries.id:records"
+                                tal:attributes="value entry/id"
+                                />
+                            <input
+                                tal:condition="not:disabled"
+                                type="hidden"
+                                name="entries.type:records"
+                                tal:attributes="value entry/type"
+                                />
+                        </td>
+                        <td class="listingCheckbox"
+                            tal:repeat="role available_roles">
+                            <tal:block define="entry_role python:entry['roles'][role['id']]">
+                                <img tal:condition="python:entry_role == 'global'" tal:replace="structure context/site_icon.png" />
+                                <img tal:condition="python:entry_role == 'acquired'" tal:replace="structure context/confirm_icon.png" />
+                                <tal:block condition="python:entry_role in (True, False)">
+                                  <input class="noborder"
+                                         type="checkbox"
+                                         value="True"
+                                         tal:attributes="name string:entries.role_${role/id}:records;
+                                                         checked python:entry_role and 'checked' or None;
+                                                         disabled python:disabled or None"
+                                         />
+                                </tal:block>
+                            </tal:block>
+                        </td>
+                    </tr>
+                </tal:entries>
+            </tbody>
+        </table>
+        </div>
+
+        <div class="field" id="field-inherit"
+             tal:condition="view/can_edit_inherit">
+            <input class="noborder"
+                   type="checkbox"
+                   name="inherit:boolean"
+                   value="1"
+                   checked="checked"
+                   id="inherit"
+                   tal:attributes="checked python:view.inherited() and 'checked' or None"
+                   />
+            <label for="inherit" i18n:translate="label_inherit_local_roles">
+            Inherit permissions from higher levels
+            </label>
+            <div class="formHelp" i18n:translate="help_inherit_local_roles">
+                By default, permissions from the container of this item are inherited.
+                If you disable this, only the explicitly defined sharing permissions will
+                be valid.
+                In the overview, the symbol
+                <img i18n:name="image_confirm_icon"
+                     tal:replace="structure context/confirm_icon.png" />
+                indicates an inherited value. Similarly, the symbol
+                <img i18n:name="image_link_icon"
+                     tal:replace="structure context/site_icon.png" />
+                indicates a global role, which is managed by the site administrator.
+            </div>
+        </div>
+        <div class="field">
+                <input type="text"
+                       id="message-optional"
+                       size="30"
+                       name="message_optional"
+                       title="Message (Optional)"
+                       placeholder="Message (Optional)"
+                       i18n:attributes="title; placeholder"
+                       class=""
+                       value=""
+                       />
+            </div>
+
+            <input id="sharing-save-button" class="context allowMultiSubmit" type="submit" name="form.button.Save" value="Save" i18n:attributes="value label_save" />
+            <input class="standalone" type="submit" name="form.button.Cancel" value="Cancel" i18n:attributes="value label_cancel"/>
+
+            <input tal:replace="structure context/@@authenticator/authenticator" />
+
+        </form>
+    </div>
+</metal:main>
+</body>
+</html>
\ No newline at end of file
diff --git a/castle/cms/tasks/email.py b/castle/cms/tasks/email.py
index 712e6b651..ce5a03c69 100644
--- a/castle/cms/tasks/email.py
+++ b/castle/cms/tasks/email.py
@@ -70,6 +70,7 @@ def send_email_reminder(obj, data):
 
     cache_key = '-'.join(api.portal.get().getPhysicalPath()[1:]) + '-email-reminders'
     reminder_cache = {}
+    cache.set(cache_key, reminder_cache)
 
     try:
         reminder_cache = cache.get(cache_key)
@@ -86,20 +87,31 @@ def send_email_reminder(obj, data):
         reminder_cache[data['pid'] + '#' + data['uid']] = data
         cache.set(cache_key, reminder_cache)
 
-        obj_path = obj.getPhysicalPath()
+        obj_path = '/'.join(obj.getPhysicalPath())
 
         try:
+            recipients=data['email']
+            subject="New Page Assigned: %s" % (
+                api.portal.get_registry_record('plone.site_title'))
+            html="""
+                <p>Hi %s,</p>
+
+                <p>You have been assigned a new page:</p>
+                <p> %s </p>
+                <p>When your task is complete, you may un-assign yourself from this page.</p>""" % (
+                            data['name'], obj_path)
+            message = data.get('message')
+            if message:
+                html += """
+
+                <p> %s </p>
+                """ % (message)
+            
             utils.send_email(
-                recipients=data['email'],
-                subject="Page Assigned: %s" % (
-                    api.portal.get_registry_record('plone.site_title')),
-                html="""
-                    <p>Hi %s,</p>
-
-                    <p>You have been assigned a new page:</p>
-                    <p> %s </p>
-                    <p>When your task is complete, you may un-assign yourself from this page.</p>""" % (
-                                data['name'], obj_path))
+                recipients=recipients,
+                subject=subject,
+                html=html
+            )
         except Exception:
             logger.warn('Could not send assignment email ', exc_info=True)
     else:

From f64738ac94ab4b92712df50fedf0db57d8558069 Mon Sep 17 00:00:00 2001
From: Adam McNevin <miknevinas@gmail.com>
Date: Mon, 11 Mar 2024 09:03:10 -1000
Subject: [PATCH 16/20] Fix indexes and update emails

---
 castle/cms/browser/dashboard.py     |  2 +-
 castle/cms/cron/_email_reminders.py | 53 +++++++++++++----------------
 castle/cms/indexing/configure.zcml  |  2 +-
 castle/cms/indexing/indexers.py     | 10 +++---
 4 files changed, 30 insertions(+), 37 deletions(-)

diff --git a/castle/cms/browser/dashboard.py b/castle/cms/browser/dashboard.py
index a6436ecee..6f1804160 100644
--- a/castle/cms/browser/dashboard.py
+++ b/castle/cms/browser/dashboard.py
@@ -204,7 +204,7 @@ def get_user_created(self):
             Creator=member.getUserName()
         )
         return self._paging(query, 'user-created')
-    
+
     def get_user_assigned(self):
         member = api.user.get_current()
         query = dict(
diff --git a/castle/cms/cron/_email_reminders.py b/castle/cms/cron/_email_reminders.py
index 807f35a0c..fe5363060 100644
--- a/castle/cms/cron/_email_reminders.py
+++ b/castle/cms/cron/_email_reminders.py
@@ -32,39 +32,34 @@ def send_reminders(site):
             obj = brain.getObject()
             roles = obj.get_local_roles_for_userid(item.get('uid'))
             obj_path = '/'.join(obj.getPhysicalPath())
-            if 'Reviewer' in roles:
-                if item.get('reminder_date') < DateTime():
-                    try:
-                        recipients=item['email']
-                        subject="Page Assigned: %s" % (
-                            api.portal.get_registry_record('plone.site_title'))
-                        html="""
-                            <p>Hi %s,</p>
-
-                            <p>You have been assigned a new page:</p>
-                            <p> %s </p>
-                            <p>When your task is complete, you may un-assign yourself from this page.</p>""" % (
-                                        item['name'], obj_path)
-                        message = item.get('message')
-                        if message:
-                            html += """
-
-                            <p> %s </p>
-                            """ % (message)
-                        
-                        utils.send_email(
-                            recipients=recipients,
-                            subject=subject,
-                            html=html
-                        )
-                    except Exception:
-                        logger.warn('Could not send assignment email ', exc_info=True)
+            if 'Reviewer' in roles and item.get('reminder_date') < DateTime():
+                try:
+                    recipients=item['email']
+                    subject="Page Assigned: %s" % (
+                        api.portal.get_registry_record('plone.site_title'))
+                    html="""
+                        <p>Hi %s,</p>
+                        <p>You have been assigned a new page:</p>
+                        <p> %s </p>
+                        <p>When your task is complete, you may un-assign yourself from this page.</p>""" % (
+                                    item['name'], obj_path)
+                    message = item.get('message')
+                    if message:
+                        html += """
+                        <p> %s </p>
+                        """ % (message)
+
+                    utils.send_email(
+                        recipients=recipients,
+                        subject=subject,
+                        html=html
+                    )
+                except Exception:
+                    logger.warn('Could not send assignment email ', exc_info=True)
             else:
                 new_cache = deepcopy(reminder_cache) # Not sure if deepcopy is necessary
                 new_cache.pop(key, None)
                 cache.set(cache_key, new_cache)
-        
-    
 
 
 def run(app):
diff --git a/castle/cms/indexing/configure.zcml b/castle/cms/indexing/configure.zcml
index b2c62d20b..53d6ffb27 100644
--- a/castle/cms/indexing/configure.zcml
+++ b/castle/cms/indexing/configure.zcml
@@ -43,6 +43,6 @@
   <adapter name="image_info" factory=".indexers.image_info" />
   <adapter name="has_custom_markup" factory=".indexers.has_custom_markup" />
   <adapter name="actors" factory=".indexers.actors" />
-  <adapter name="assigned_users" factory=".indexers.actors" />
+  <adapter name="assigned_users" factory=".indexers.assigned_users" />
 
 </configure>
diff --git a/castle/cms/indexing/indexers.py b/castle/cms/indexing/indexers.py
index 55b94e4f5..5062d8a38 100644
--- a/castle/cms/indexing/indexers.py
+++ b/castle/cms/indexing/indexers.py
@@ -237,15 +237,13 @@ def actors(context):
 @indexer(IItem)
 def assigned_users(context):
     # Get local roles for an object
-    # These roles are assigned individually, not inherited
     assigned_users = []
-
+    
     acl_users = api.portal.get_tool('acl_users')
-    local_roles = acl_users._getLocalRolesForDisplay(context)
+    local_roles = acl_users.getLocalRolesForDisplay(context)
 
     for name, roles, rtype, rid in local_roles:
-        if 'Owner' not in roles and rtype == 'user':
-            # 'Owner' indicates a global role assigned by admin
-            # These can only be un-assigned by admin, so we're ignoring them
+        # Only items assigned 'Reviewer' status to user will appear on dashboard
+        if 'Reviewer' in roles:
             assigned_users.append(name)
     return assigned_users

From 939d879eb299fc9a5f5b3e76ea06b786d0fc44e8 Mon Sep 17 00:00:00 2001
From: Adam McNevin <miknevinas@gmail.com>
Date: Tue, 12 Mar 2024 08:37:53 -1000
Subject: [PATCH 17/20] Fix 'actors' index

---
 castle/cms/indexing/indexers.py | 28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

diff --git a/castle/cms/indexing/indexers.py b/castle/cms/indexing/indexers.py
index 5062d8a38..f52b91630 100644
--- a/castle/cms/indexing/indexers.py
+++ b/castle/cms/indexing/indexers.py
@@ -13,6 +13,7 @@
 from Products.CMFCore.interfaces._content import IFolderish
 from ZODB.POSException import POSKeyError
 from zope.globalrequest import getRequest
+from plone.app.dexterity.behaviors.metadata import IOwnership
 
 from castle.cms.behaviors.location import ILocation
 from castle.cms.interfaces import IHasDefaultImage
@@ -222,14 +223,25 @@ def has_custom_markup(image):
 def actors(context):
     # Get history of users that have modified an object
     actors = []
+    ownership = IOwnership(context, None)
+    if ownership is not None:
+        for actor in ownership.contributors:
+            actors.append(actor) if actor not in actors else None
 
-    rt = api.portal.get_tool("portal_repository")
-    history = rt.getHistoryMetadata(context)
-    
-    for i in range(history.getLength(countPurged=False)):
-        data = history.retrieve(i, countPurged=False)
-        actor = data["metadata"]["sys_metadata"]["principal"]
-        actors.append(actor) if actor not in actors else None
+        req = getRequest()
+        if req is not None and not IReindexActive.providedBy(req):
+            try:
+                # When a user modifies an item, the item's revision history
+                # is not updated until AFTER reindexing. Here we manually
+                # update the index if the user modified something so it
+                # can immediately appear on the dashboard
+                user_id = api.user.get_current().getId()
+                if (user_id not in ownership.contributors):
+                    ownership.contributors = ownership.contributors + (
+                        user_id.decode('utf8'),)
+                    actors.append(user_id)
+            except Exception:
+                pass
 
     return actors
 
@@ -243,7 +255,7 @@ def assigned_users(context):
     local_roles = acl_users.getLocalRolesForDisplay(context)
 
     for name, roles, rtype, rid in local_roles:
-        # Only items assigned 'Reviewer' status to user will appear on dashboard
+        # Only users assigned 'Reviewer' status will be indexed for now
         if 'Reviewer' in roles:
             assigned_users.append(name)
     return assigned_users

From 50586a9035e1c22f84bccad1cca3dd14cedf10fd Mon Sep 17 00:00:00 2001
From: Adam McNevin <miknevinas@gmail.com>
Date: Wed, 13 Mar 2024 13:06:28 -1000
Subject: [PATCH 18/20] Add upgrade profile

---
 castle/cms/profiles/3013/catalog.xml          | 16 ++++++++++++++++
 .../cms/profiles/3013/registry/resources.xml  | 16 ++++++++++++++++
 castle/cms/profiles/default/catalog.xml       | 12 ++++++++++++
 castle/cms/profiles/default/metadata.xml      |  2 +-
 castle/cms/upgrades.zcml                      | 17 +++++++++++++++++
 castle/cms/upgrades/__init__.py               | 19 +++++++++++++++++++
 6 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 castle/cms/profiles/3013/catalog.xml
 create mode 100644 castle/cms/profiles/3013/registry/resources.xml

diff --git a/castle/cms/profiles/3013/catalog.xml b/castle/cms/profiles/3013/catalog.xml
new file mode 100644
index 000000000..b9e33c21d
--- /dev/null
+++ b/castle/cms/profiles/3013/catalog.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<object name="portal_catalog" meta_type="Plone Catalog Tool">
+
+  <index name="actors" meta_type="KeywordIndex">
+    <indexed_attr value="actors"/>
+  </index>
+
+  <column value="actors"/>
+
+  <index name="assigned_users" meta_type="KeywordIndex">
+    <indexed_attr value="assigned_users"/>
+  </index>
+
+  <column value="assigned_users"/>
+
+</object>
\ No newline at end of file
diff --git a/castle/cms/profiles/3013/registry/resources.xml b/castle/cms/profiles/3013/registry/resources.xml
new file mode 100644
index 000000000..53368330b
--- /dev/null
+++ b/castle/cms/profiles/3013/registry/resources.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<registry xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+  i18n:domain="plone">
+
+  <records prefix="plone.bundles/plone"
+    interface='Products.CMFPlone.interfaces.IBundleRegistry'>
+    <value key="last_compilation">2024-03-12 00:00:00</value>
+  </records>
+
+
+  <records prefix="plone.bundles/plone-logged-in"
+    interface='Products.CMFPlone.interfaces.IBundleRegistry'>
+    <value key="last_compilation">2024-03-12 00:00:00</value>
+  </records>
+
+</registry>
\ No newline at end of file
diff --git a/castle/cms/profiles/default/catalog.xml b/castle/cms/profiles/default/catalog.xml
index 0aa405de7..1607852f2 100644
--- a/castle/cms/profiles/default/catalog.xml
+++ b/castle/cms/profiles/default/catalog.xml
@@ -51,4 +51,16 @@
 
   <column value="has_custom_markup"/>
 
+  <index name="actors" meta_type="KeywordIndex">
+    <indexed_attr value="actors"/>
+  </index>
+
+  <column value="actors"/>
+
+  <index name="assigned_users" meta_type="KeywordIndex">
+    <indexed_attr value="assigned_users"/>
+  </index>
+
+  <column value="assigned_users"/>
+
 </object>
diff --git a/castle/cms/profiles/default/metadata.xml b/castle/cms/profiles/default/metadata.xml
index 08aa3f2b1..a9dcf0a0f 100644
--- a/castle/cms/profiles/default/metadata.xml
+++ b/castle/cms/profiles/default/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <metadata>
-  <version>3012</version>
+  <version>3013</version>
   <dependencies>
     <dependency>profile-plone.app.querystring:default</dependency>
     <dependency>profile-plone.app.mosaic:default</dependency>
diff --git a/castle/cms/upgrades.zcml b/castle/cms/upgrades.zcml
index 48de65901..d570f9cd2 100644
--- a/castle/cms/upgrades.zcml
+++ b/castle/cms/upgrades.zcml
@@ -192,4 +192,21 @@
     profile="castle.cms:default"
   />
 
+  <genericsetup:registerProfile
+    name="3013"
+    title="CastleCMS upgrade to 3013 profile"
+    directory="profiles/3013"
+    description=""
+    provides="Products.GenericSetup.interfaces.EXTENSION"
+  />
+  <genericsetup:upgradeStep
+    title="Upgrade CastleCMS to 3.0.13"
+    description="3013 - Add new indexes to render additional items on dashboard"
+    source="*"
+    destination="3013"
+    handler=".upgrades.upgrade_3013"
+    profile="castle.cms:default"
+  />
+
+
 </configure>
diff --git a/castle/cms/upgrades/__init__.py b/castle/cms/upgrades/__init__.py
index ebb3f77b3..b3426eec6 100644
--- a/castle/cms/upgrades/__init__.py
+++ b/castle/cms/upgrades/__init__.py
@@ -137,3 +137,22 @@ def upgrade_3011(site, logger=CASTLE_LOGGER):
 
 
 upgrade_3012 = default_upgrade_factory('3012')
+
+
+def upgrade_3013(site, logger=CASTLE_LOGGER):
+    # catalog = api.portal.get_tool('portal_catalog')
+    # catalog.manage_catalogRebuild()
+
+
+    portal_types_tool = api.portal.get_tool('portal_types')
+
+    for portal_type in portal_types_tool:
+        logger.info('reindexing actors and assigned_users for portal_type ' + portal_type)
+        # this could take a while
+        for portal_type_brain in api.content.find(portal_type=portal_type):
+            try:
+                content_object = portal_type_brain.getObject()
+                content_object.reindexObject(idxs=['actors', 'assigned_users'])
+            except Exception:
+                logger.info('something weird happened with ' + repr(portal_type_brain))
+                continue

From 4016f36cc1672057f118cc7ae4529cf79f822837 Mon Sep 17 00:00:00 2001
From: Adam McNevin <miknevinas@gmail.com>
Date: Thu, 14 Mar 2024 08:44:33 -1000
Subject: [PATCH 19/20] Revert 'actors' index to leverage 'portal_repository'

---
 castle/cms/indexing/indexers.py | 22 +++++++++++-----------
 castle/cms/upgrades/__init__.py | 20 +-------------------
 2 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/castle/cms/indexing/indexers.py b/castle/cms/indexing/indexers.py
index f52b91630..6aa58915e 100644
--- a/castle/cms/indexing/indexers.py
+++ b/castle/cms/indexing/indexers.py
@@ -221,12 +221,15 @@ def has_custom_markup(image):
 
 @indexer(IItem)
 def actors(context):
-    # Get history of users that have modified an object
+    # Get history of users that have modified an item
     actors = []
-    ownership = IOwnership(context, None)
-    if ownership is not None:
-        for actor in ownership.contributors:
-            actors.append(actor) if actor not in actors else None
+    rt = api.portal.get_tool("portal_repository")
+    history = rt.getHistoryMetadata(context)
+
+    for i in range(history.getLength(countPurged=False)):
+        data = history.retrieve(i, countPurged=False)
+        actor = data["metadata"]["sys_metadata"]["principal"]
+        actors.append(actor) if actor not in actors else None
 
         req = getRequest()
         if req is not None and not IReindexActive.providedBy(req):
@@ -235,11 +238,8 @@ def actors(context):
                 # is not updated until AFTER reindexing. Here we manually
                 # update the index if the user modified something so it
                 # can immediately appear on the dashboard
-                user_id = api.user.get_current().getId()
-                if (user_id not in ownership.contributors):
-                    ownership.contributors = ownership.contributors + (
-                        user_id.decode('utf8'),)
-                    actors.append(user_id)
+                current_user = api.user.get_current().getUserName()
+                actors.append(current_user) if current_user not in actors else None
             except Exception:
                 pass
 
@@ -248,7 +248,7 @@ def actors(context):
 
 @indexer(IItem)
 def assigned_users(context):
-    # Get local roles for an object
+    # Get local roles for an item
     assigned_users = []
     
     acl_users = api.portal.get_tool('acl_users')
diff --git a/castle/cms/upgrades/__init__.py b/castle/cms/upgrades/__init__.py
index b3426eec6..39d3bbf81 100644
--- a/castle/cms/upgrades/__init__.py
+++ b/castle/cms/upgrades/__init__.py
@@ -137,22 +137,4 @@ def upgrade_3011(site, logger=CASTLE_LOGGER):
 
 
 upgrade_3012 = default_upgrade_factory('3012')
-
-
-def upgrade_3013(site, logger=CASTLE_LOGGER):
-    # catalog = api.portal.get_tool('portal_catalog')
-    # catalog.manage_catalogRebuild()
-
-
-    portal_types_tool = api.portal.get_tool('portal_types')
-
-    for portal_type in portal_types_tool:
-        logger.info('reindexing actors and assigned_users for portal_type ' + portal_type)
-        # this could take a while
-        for portal_type_brain in api.content.find(portal_type=portal_type):
-            try:
-                content_object = portal_type_brain.getObject()
-                content_object.reindexObject(idxs=['actors', 'assigned_users'])
-            except Exception:
-                logger.info('something weird happened with ' + repr(portal_type_brain))
-                continue
+upgrade_3013 = default_upgrade_factory('3013')

From d68ca419631e7fc2b5ca3336951f28c29c474335 Mon Sep 17 00:00:00 2001
From: Adam McNevin <miknevinas@gmail.com>
Date: Tue, 28 May 2024 12:52:01 -0500
Subject: [PATCH 20/20] Dashboard updates

---
 castle/cms/browser/dashboard.py               |  2 +-
 .../templates/dashboard-statistics.pt         | 80 +++++++++----------
 2 files changed, 38 insertions(+), 44 deletions(-)

diff --git a/castle/cms/browser/dashboard.py b/castle/cms/browser/dashboard.py
index 6f1804160..223c896a5 100644
--- a/castle/cms/browser/dashboard.py
+++ b/castle/cms/browser/dashboard.py
@@ -201,7 +201,7 @@ def get_user_created(self):
         query = dict(
             sort_on='created', 
             sort_order='reverse', 
-            Creator=member.getUserName()
+            Creator=member.getId()
         )
         return self._paging(query, 'user-created')
 
diff --git a/castle/cms/fragments/templates/dashboard-statistics.pt b/castle/cms/fragments/templates/dashboard-statistics.pt
index 5db42f969..7536ece56 100644
--- a/castle/cms/fragments/templates/dashboard-statistics.pt
+++ b/castle/cms/fragments/templates/dashboard-statistics.pt
@@ -8,21 +8,20 @@
 
 <div class="row castle-statistics-container" style="clear: both">
   <div class="col-md-4 load-container-user-modified"
-       tal:attributes="class python: has_assigned and 'col-md-4 load-container-user-modified' or 'col-md-6 load-container-user-modified'"
+       tal:attributes="class python: 'col-md-4 load-container-user-modified' if has_assigned else 'col-md-6 load-container-user-modified'"
        tal:define="results dutils/get_user_modified">
-    <h3>My Changes</h3>
-    <button type="button" 
-            class="plone-btn plone-btn-default show-hide"
+    <h3>My Changes <button type="button" 
+            class="plone-btn plone-btn-sm plone-btn-secondary show-hide"
             data-name="user-activity">
             Show/Hide
-    </button>
+    </button></h3>
     <div id="user-activity">
       <table>
         <thead>
           <tr class="dots">
-            <th scope="col">Title</th>
-            <th scope="col">Last modified by</th>
-            <th scope="col">Modified</th>
+            <th scope="col" style="padding:0 10px 0 0;">Title</th>
+            <th scope="col" style="padding:0 10px 0 0;">Last modified by</th>
+            <th scope="col" style="padding:0 10px 0 0;">Modified</th>
           </tr>
         </thead>
         <tbody>
@@ -60,19 +59,18 @@
   <div class="col-md-4 load-container-user-created"
        tal:attributes="class python: has_assigned and 'col-md-4 load-container-user-created' or 'col-md-6 load-container-user-created'"
        tal:define="results dutils/get_user_created">
-    <h3>My Additions</h3>
-    <button type="button" 
-            class="plone-btn plone-btn-default show-hide"
+    <h3>My Additions <button type="button" 
+            class="plone-btn plone-btn-sm plone-btn-secondary show-hide"
             data-name="user-additions">
             Show/Hide
-    </button>
+    </button></h3>
     <div id="user-additions">
       <table>
         <thead>
           <tr class="dots">
-            <th scope="col">Title</th>
-            <th scope="col">Created by</th>
-            <th scope="col">Created</th>
+            <th scope="col" style="padding:0 10px 0 0;">Title</th>
+            <th scope="col" style="padding:0 10px 0 0;">Created by</th>
+            <th scope="col" style="padding:0 10px 0 0;">Created</th>
           </tr>
         </thead>
         <tbody>
@@ -110,19 +108,18 @@
   <div class="col-md-4 load-container-user-assigned"
        tal:condition="has_assigned"
        tal:define="results dutils/get_user_assigned">
-    <h3>My Assigned Pages</h3>
-    <button type="button" 
-            class="plone-btn plone-btn-default show-hide"
+    <h3>My Assigned Pages <button type="button" 
+            class="plone-btn plone-btn-sm plone-btn-secondary show-hide"
             data-name="user-assigned">
             Show/Hide
-    </button>
+    </button></h3>
     <div id="user-assigned">
       <table>
         <thead>
           <tr class="dots">
-            <th scope="col">Title</th>
-            <th scope="col">Created by</th>
-            <th scope="col">Created</th>
+            <th scope="col" style="padding:0 10px 0 0;">Title</th>
+            <th scope="col" style="padding:0 10px 0 0;">Created by</th>
+            <th scope="col" style="padding:0 10px 0 0;">Created</th>
           </tr>
         </thead>
         <tbody>
@@ -162,19 +159,18 @@
   <div class="col-md-4 load-container-modified"
        tal:attributes="class python: has_unders_review and 'col-md-4 load-container-modified' or 'col-md-6 load-container-modified'"
        tal:define="results dutils/get_recently_modified">
-    <h3>Recent Changes</h3>
-    <button type="button" 
-            class="plone-btn plone-btn-default show-hide"
+    <h3>Recent Changes <button type="button" 
+            class="plone-btn plone-btn-sm plone-btn-secondary show-hide"
             data-name="recent-activity">
             Show/Hide
-    </button>
+    </button></h3>
     <div id="recent-activity">
       <table>
         <thead>
           <tr class="dots">
-            <th scope="col">Title</th>
-            <th scope="col">Last modified by</th>
-            <th scope="col">Modified</th>
+            <th scope="col" style="padding:0 10px 0 0;">Title</th>
+            <th scope="col" style="padding:0 10px 0 0;">Last modified by</th>
+            <th scope="col" style="padding:0 10px 0 0;">Modified</th>
           </tr>
         </thead>
         <tbody>
@@ -212,19 +208,18 @@
   <div class="col-md-4 load-container-created"
        tal:attributes="class python: has_unders_review and 'col-md-4 load-container-created' or 'col-md-6 load-container-created'"
        tal:define="results dutils/get_recently_created">
-    <h3>Recent Additions</h3>
-    <button type="button" 
-            class="plone-btn plone-btn-default show-hide"
+    <h3>Recent Additions <button type="button" 
+            class="plone-btn plone-btn-sm plone-btn-secondary show-hide"
             data-name="recent-additions">
             Show/Hide
-    </button>
+    </button></h3>
     <div id="recent-additions">
       <table>
         <thead>
           <tr class="dots">
-            <th scope="col">Title</th>
-            <th scope="col">Created by</th>
-            <th scope="col">Created</th>
+            <th scope="col" style="padding:0 10px 0 0;">Title</th>
+            <th scope="col" style="padding:0 10px 0 0;">Created by</th>
+            <th scope="col" style="padding:0 10px 0 0;">Created</th>
           </tr>
         </thead>
         <tbody>
@@ -260,19 +255,18 @@
     </div>
   </div>
   <div class="col-md-4 load-container-review" tal:condition="has_unders_review">
-    <h3>Under Review</h3>
-    <button type="button" 
-            class="plone-btn plone-btn-default show-hide"
+    <h3>Under Review <button type="button" 
+            class="plone-btn plone-btn-sm plone-btn-secondary show-hide"
             data-name="under-review">
             Show/Hide
-    </button>
+    </button></h3>
     <div id="under-review">
       <table>
         <thead>
           <tr class="dots">
-            <th scope="col">Title</th>
-            <th scope="col">Last modified by</th>
-            <th scope="col">Modified</th>
+            <th scope="col" style="padding:0 10px 0 0;">Title</th>
+            <th scope="col" style="padding:0 10px 0 0;">Last modified by</th>
+            <th scope="col" style="padding:0 10px 0 0;">Modified</th>
           </tr>
         </thead>
         <tbody>