Changeset 7155

Timestamp:

20 Nov 2011, 12:02:23 (13 years ago)

Author:

Henrik Bettermann

Message:

Prepare for use of ApplicantPrincipalRoleManager? also in students package.

In the next step I will move the class to the securitypolicy module in students and inherit from the new StudentPrincipalRoleManager? class.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/applicants/securitypolicy.py (modified) (4 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/applicants/securitypolicy.py

@@ -34 +34 @@
 from zope.securitypolicy.settings import Allow, Deny, Unset
 from waeup.sirp.applicants.interfaces import IApplicant
+#from waeup.sirp.students.securitypolicy import StudentPrincipalRoleManager
 
 # All components in here have the same context: Applicant instances
@@ -40 +41 @@
 class ApplicantPrincipalRoleManager(AnnotationPrincipalRoleManager,
                                     grok.Adapter):
+
     grok.provides(IPrincipalRoleManager)
 
     #: The attribute name to lookup for additional roles
     extra_attrib = 'course1'
+    subcontainer = None
 
     #: List of role names to look for in `extra_attrib` and parents.
@@ -86 +89 @@
         attributes.
         """
-        result = super(ApplicantPrincipalRoleManager, self
-                     ).getRolesForPrincipal(principal_id)
+        apr_manager = AnnotationPrincipalRoleManager(self._context)
+        result = apr_manager.getRolesForPrincipal(principal_id)
         if result != []:
             # If there are local roles defined here, no additional
@@ -94 +97 @@
         # The principal has no local roles yet. Let's lookup the
         # connected course, dept, etc.
-        obj = getattr(self._context, self.extra_attrib, None)
+        if self.subcontainer:
+            obj = getattr(
+                self._context[self.subcontainer], self.extra_attrib, None)
+        else:
+            obj = getattr(self._context, self.extra_attrib, None)
         # lookup local roles for connected course and all parent
         # objects. This way we fake 'role inheritance'.