When computing batch check class-permissions first

Author: schlatterbeck

roundup/cgi/templating.py

@@ -3453,9 +3453,12 @@ def batch(self, permission='View'):
             matches = None
 
         # filter for visibility
-        allowed = [itemid for itemid in klass.filter(matches, filterspec,
-                                                     sort, group)
-                   if check(permission, userid, self.classname, itemid=itemid)]
+        item_ids = klass.filter(matches, filterspec, sort, group)
+        if check(permission, userid, self.classname, only_no_check = True):
+            allowed = item_ids
+        else:
+            allowed = [id for id in item_ids
+                       if check(permission, userid, self.classname, itemid=id)]
 
         # return the batch object, using IDs only
         return Batch(self.client, allowed, self.pagesize, self.startwith,

roundup/security.py

@@ -310,7 +310,7 @@ def getPermission(self, permission, classname=None, properties=None,
                                                                   classname))
 
     def hasPermission(self, permission, userid, classname=None,
-                      property=None, itemid=None):
+                      property=None, itemid=None, only_no_check=False):
         '''Look through all the Roles, and hence Permissions, and
            see if "permission" exists given the constraints of
            classname, property, itemid, and props_only.
@@ -345,7 +345,10 @@ def hasPermission(self, permission, userid, classname=None,
         # Note that checks with a check method are typically a lot more
         # expensive than the ones without. So we check the ones without
         # a check method first
-        for has_check in False, True:
+        checklist = (False, True)
+        if only_no_check:
+            checklist = (False,)
+        for has_check in checklist:
             for rolename in self.db.user.get_roles(userid):
                 if not rolename or (rolename not in self.role):
                     continue