# HG changeset patch
# User Sverre Rabbelier <srabbelier@gmail.com>
# Date 1234561901 0
# Node ID a89d673771eb2b298475ad9eef035ea5ef692c1b
# Parent  e209bda5addbc0e279b60fa925c47c2404b535f4
Factor out the hasMembership method from checkMembership

This makes it possible for the document picker to reuse it.

Patch by: Sverre Rabbelier

diff -r e209bda5addb -r a89d673771eb app/soc/views/helper/access.py
--- a/app/soc/views/helper/access.py	Fri Feb 13 21:51:16 2009 +0000
+++ b/app/soc/views/helper/access.py	Fri Feb 13 21:51:41 2009 +0000
@@ -345,6 +345,25 @@
     for checker_name, args in self[access_type]:
       self.check(use_cache, checker_name, django_args, args)
 
+  def hasMembership(self, roles, django_args):
+    """Checks whether the user has access to any of the specified roles.
+
+    Args:
+      roles: a list of roles to check
+    """
+
+    for role in roles:
+      try:
+        checker_name, args = self.normalizeChecker(self.MEMBERSHIP[role])
+        self.doCheck(checker_name, django_args, args)
+        # the check passed, we can stop now
+        return True
+      except out_of_band.Error:
+        continue
+
+    return False
+
+  @allowDeveloper
   def checkMembership(self, action, prefix, status, django_args):
     """Checks whether the user has access to the specified status.
 
@@ -366,18 +385,9 @@
 
     # try to see if they belong to any of the roles, if not, raise an
     # access violation for the specified action, prefix and status.
-    for role in roles:
-      try:
-        checker_name, args = self.normalizeChecker(self.MEMBERSHIP[role])
-        self.doCheck(checker_name, django_args, args)
-        # the check passed, we can stop now
-        break
-      except out_of_band.Error:
-        continue
-    else:
+    if not self.hasMembership(roles, django_args):
       raise out_of_band.AccessViolation(message_fmt)
 
-
   def allow(self, django_args):
     """Never raises an alternate HTTP response.  (an access no-op, basically).