revert r15739, because it's slower.

Instead, cache this value when we have it in allowedRolesAndUsers, and use the cached value in getViewPermissionOwner



git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@16497 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5Catalog/CatalogTool.py

@@ -155,13 +155,18 @@ class IndexableObjectWrapper(CMFCoreIndexableObjectWrapper):
             # we may sometimes catalog the owner user ID whenever the Owner
             # has view permission (see getAllowedRolesAndUsers bellow
             # as well as getViewPermissionOwner method in Base)
-            if role != 'Owner': 
+            if role != 'Owner':
               if withnuxgroups:
                 allowed[user + ':' + role] = 1
               else:
                 allowed['user:' + user + ':' + role] = 1
+            elif 'Owner' in allowed:
+              ob._v_view_permission_owner = user
+
         if allowed.has_key('Owner'):
           del allowed['Owner']
+        else:
+          ob._v_view_permission_owner = None
         return list(allowed.keys())
 
 class RelatedBaseCategory(Method):

product/ERP5Type/Base.py

@@ -1704,12 +1704,17 @@ class Base( CopyContainer,
   security.declareProtected( Permissions.AccessContentsInformation, 'getViewPermissionOwner' )
   def getViewPermissionOwner(self):
     """
-      Returns the user ID of the owner if this user has View permission,
-      otherwise returns None.
+      Returns the user ID of the owner if Owner role
+      has View permission. Returns None else.
     """
-    owner = self.getWrappedOwner()
-    if owner is not None and owner.has_permission(Permissions.View, self):
-      return str(owner)
+    marker = []
+    if getattr(aq_base(self), '_v_view_permission_owner', marker) is not marker:
+      return self._v_view_permission_owner
+
+    path, user_id = self.getOwnerTuple()
+    if 'Owner' in rolesForPermissionOn(Permissions.View, self):
+      path, user_id = self.getOwnerTuple()
+      return user_id
     return None
 
   # Private accessors for the implementation of relations based on