From 2a689a871b9fb8f4c1a5332a9ab81e0eb5289ba4 Mon Sep 17 00:00:00 2001
From: Helmut Merz <helmutm@cy55.de>
Date: Fri, 4 Oct 2024 14:45:40 +0200
Subject: [PATCH] fix overrides.zcml: set skin; fix resource indexing: avoid
 error when principal not found

---
 loops/organize/util.py | 5 +++--
 loops/overrides.zcml   | 2 ++
 loops/resource.py      | 9 ++++++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/loops/organize/util.py b/loops/organize/util.py
index c76e3e6..177cbd5 100644
--- a/loops/organize/util.py
+++ b/loops/organize/util.py
@@ -84,8 +84,9 @@ def getInternalPrincipal(id, context=None, pau=None):
     raise PrincipalLookupError(id)
 
 
-def getPrincipalForUserId(id, context=None):
-    auth = component.getUtility(IAuthentication, context=context)
+def getPrincipalForUserId(id, context=None, auth=None):
+    if auth is None:
+        auth = component.getUtility(IAuthentication, context=context)
     try:
         return auth.getPrincipal(id)
     except PrincipalLookupError:
diff --git a/loops/overrides.zcml b/loops/overrides.zcml
index 1417c49..a99acbc 100644
--- a/loops/overrides.zcml
+++ b/loops/overrides.zcml
@@ -4,6 +4,8 @@
 
   <!-- ZCML declarations to override the default definitions -->
 
+  <browser:defaultSkin name="Loops" />
+
   <browser:containerViews
       for="zope.app.folder.interfaces.IFolder"
       contents="zope.ManageContent"
diff --git a/loops/resource.py b/loops/resource.py
index 2f6ec4d..23b30d7 100644
--- a/loops/resource.py
+++ b/loops/resource.py
@@ -588,12 +588,15 @@ class IndexAttributes(object):
                         self.creators()).strip()
 
     def creators(self):
+        from loops.organize.util import getPrincipalForUserId
         cr = IZopeDublinCore(self.context).creators or []
-        pau = component.getUtility(IAuthentication)
+        pau = component.getUtility(IAuthentication, context=self.context)
         creators = []
         for c in cr:
-            principal = pau.getPrincipal(c)
-            if principal is not None:
+            principal = getPrincipalForUserId(c, auth=pau)
+            if principal is None:
+                creators.append(c)
+            else:
                 creators.append(principal.title)
         return creators