Changeset 9169 for main/waeup.kofa/branches/uli-async-update/src/waeup/kofa/students/dynamicroles.py

Timestamp:

10 Sep 2012, 11:05:07 (12 years ago)

Author:

uli

Message:

Merge changes from trunk, r8786-HEAD

Location:

main/waeup.kofa/branches/uli-async-update

Files:

• . (modified) (1 prop)
• src/waeup/kofa/students/dynamicroles.py (modified) (2 diffs)

main/waeup.kofa/branches/uli-async-update/src/waeup/kofa/students/dynamicroles.py

@@ -51 +51 @@
         """Get roles for principal with id `principal_id`.
 
-        Different to the default implementation, this method also
-        takes into account local roles set on any department connected
-        to the context student.
-
-        If the given principal has at least one of the
-        `external_rolenames` roles granted for the external object, it
-        additionally gets `additional_rolename` role for the context
-        student.
-
-        For the additional roles the `extra_attrib` and all its parent
-        objects are looked up, because 'role inheritance' does not
-        work on that basic level of permission handling.
-
-        Some advantages of this approach:
-
-        - we don't have to store extra local roles for clearance
-          officers in ZODB for each student
-
-        - when local roles on a department change, we don't have to
-          update thousands of students; the local role is assigned
-          dynamically.
-
-        Disadvantage:
-
-        - More expensive role lookups when a clearance officer wants
-          to see an student form.
-
-        This implementation is designed to be usable also for other
-        contexts than students. You can inherit from it and set
-        different role names to lookup/set easily via the static class
-        attributes.
+        See waeup.kofa.applicants.dynamicroles.ApplicantPrincipalRoleManager
+        for further information.
         """
         apr_manager = AnnotationPrincipalRoleManager(self._context)
@@ -118 +89 @@
                         result.append(
                             ('waeup.StudentsOfficer', setting))
+                elif 'UGClearanceOfficer' in role_id:
+                    if not self._context.is_postgrad:
+                        result.append(
+                            ('waeup.StudentsClearanceOfficer', setting))
+                    else:
+                        # Otherwise grant at least view permissions.
+                        result.append(
+                            ('waeup.StudentsOfficer', setting))
+                elif 'PGClearanceOfficer' in role_id:
+                    if self._context.is_postgrad:
+                        result.append(
+                            ('waeup.StudentsClearanceOfficer', setting))
+                    else:
+                        # Otherwise grant at least view permissions.
+                        result.append(
+                            ('waeup.StudentsOfficer', setting))
                 elif role_id in self.rolename_mapping.keys():
                     # Grant additional role