app/soc/views/helper/access.py
changeset 3032 f3886d1b00a5
parent 3029 3c09b9396e2e
child 3053 1dc307cb97d0
--- a/app/soc/views/helper/access.py	Fri Oct 23 13:54:11 2009 -0500
+++ b/app/soc/views/helper/access.py	Fri Oct 23 13:25:28 2009 -0700
@@ -822,12 +822,12 @@
 
   def checkHasDocumentAccess(self, django_args, logic, target_scope):
     """Checks that the user has access to the specified document scope.
-    
+
     Args:
       django_args: a dictionary with django's arguments
       logic: the logic that should be used to look up the entity
     """
-    
+
     prefix = django_args['prefix']
     if self.SCOPE_DEPTH.get(prefix):
       scope_logic, depths = self.SCOPE_DEPTH[prefix]
@@ -870,13 +870,12 @@
 
     Args:
       django_args: a dictionary with django's arguments
-      group_logic: Logic module for the type of group which the request is for
+      group_logic: Logic instance for the group which the request is for
     """
 
     self.checkIsUser(django_args)
 
-    group_entity = role_logic.getGroupEntityFromScopePath(
-        group_logic.logic, django_args['scope_path'])
+    group_entity = group_logic.getFromKeyName(django_args['scope_path'])
 
     if not group_entity:
       raise out_of_band.Error(DEF_GROUP_NOT_FOUND_MSG, status=404)
@@ -891,7 +890,7 @@
     """Raises an alternate HTTP response if the specified request does not exist
        or if it's status is not group_accepted. Also when the group this request
        is from is in an inactive or invalid status access will be denied.
-    
+
     Args:
       django_args: a dictionary with django's arguments
       role_name: name of the role