Changeset 7336

Timestamp:

13 Dec 2011, 07:30:55 (13 years ago)

Author:

Henrik Bettermann

Message:

Fix logic of dynamic course adviser role assignment.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/students/dynamicroles.py (modified) (3 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/students/dynamicroles.py

@@ -46 +46 @@
     rolename_mapping = {
         'waeup.local.ClearanceOfficer':'waeup.StudentsClearanceOfficer',
-        'waeup.local.CourseAdviser100':'waeup.StudentsCourseAdviser',
-        'waeup.local.CourseAdviser200':'waeup.StudentsCourseAdviser',
-        'waeup.local.CourseAdviser300':'waeup.StudentsCourseAdviser',
-        'waeup.local.CourseAdviser400':'waeup.StudentsCourseAdviser',
-        'waeup.local.CourseAdviser500':'waeup.StudentsCourseAdviser',
-        'waeup.local.CourseAdviser600':'waeup.StudentsCourseAdviser'
         }
 
@@ -101 +95 @@
                 self._context[self.subcontainer], self.extra_attrib, None)
             current_level = getattr(
-                self._context[self.subcontainer], 'current_level', None)
+                self._context[self.subcontainer], 'current_level', 0)
         else:
             obj = getattr(self._context, self.extra_attrib, None)
-            current_level = None
-        # lookup local roles for connected course and all parent
+            current_level = 0
+        # Lookup local roles for connected course and all parent
         # objects. This way we fake 'role inheritance'.
         while obj is not None:
@@ -111 +105 @@
                 principal_id)
             for role_id, setting in extra_roles:
-                if role_id in self.rolename_mapping.keys():
-                    # Found role in external attribute or parent
-                    # thereof. 'Grant' additional role
-                    # permissions (allow, deny or unset) for the
-                    # passed in principal id.
-                    # Make an exception for Course Advisers:
-                    # Grant additional role only if external role corresponds
-                    # with current_level of student.
-                    if not current_level or \
-                        'CourseAdviser' not in  role_id or \
-                        str(current_level) in role_id:
+                if 'CourseAdviser' in role_id:
+                    # Found a Course Adviser role in external attribute or parent
+                    # thereof. We need a special treatment for Course Advisers.
+                    if str(100*(current_level/100)) in role_id:
+                        # Grant additional role, which allows to validate or reject
+                        # course lists, only if external role corresponds
+                        # with current_level of student.
                         result.append(
-                            (self.rolename_mapping[role_id], setting))
+                            ('waeup.StudentsCourseAdviser', setting))
+                    else:
+                        # Otherwise grant at least view permissions.
+                        result.append(
+                            ('waeup.StudentsOfficer', setting))
+                elif role_id in self.rolename_mapping.keys():
+                    # Grant additional role
+                    # permissions (allow, deny or unset)
+                    # according to the rolename mapping above.
+                    result.append(
+                        (self.rolename_mapping[role_id], setting))
                     return result
             obj = getattr(obj, '__parent__', None)