Changeset 7220

Timestamp:

26 Nov 2011, 22:19:41 (13 years ago)

Author:

Henrik Bettermann

Message:

Use rolename_mapping dictionary instead of external_rolenames and additional_rolename.

Location:

main/waeup.sirp/trunk/src/waeup/sirp

Files:

• applicants/dynamicroles.py (modified) (1 diff)
• students/dynamicroles.py (modified) (3 diffs)

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

@@ -43 +43 @@
     subcontainer = None
 
-    #: List of role names to look for in `extra_attrib` and parents.
-    external_rolenames = ['waeup.local.ClearanceOfficer',]
-
-    #: Role to add in case one of the above roles was found.
-    additional_rolename = 'waeup.ApplicationsOfficer'
+    # Role name mapping:
+    # role name to look for in `extra_attrib` and parents
+    # to
+    # role to add in case this role was found
+    rolename_mapping = {
+        'waeup.local.ClearanceOfficer':'waeup.ApplicationsOfficer',
+        }

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

@@ -42 +42 @@
     subcontainer = 'studycourse'
 
-    #: List of role names to look for in `extra_attrib` and parents.
-    external_rolenames = ['waeup.local.ClearanceOfficer',]
-
-    #: Role to add in case one of the above roles was found.
-    additional_rolename = 'waeup.StudentsClearanceOfficer'
+    # Role name mapping:
+    # role name to look for in `extra_attrib` and parents
+    # to
+    # role to add in case this role was found
+    rolename_mapping = {
+        'waeup.local.ClearanceOfficer':'waeup.StudentsClearanceOfficer',
+        'waeup.local.CourseAdviser100':'waeup.StudentsCourseAdviser100',
+        'waeup.local.CourseAdviser200':'waeup.StudentsCourseAdviser200',
+        'waeup.local.CourseAdviser300':'waeup.StudentsCourseAdviser300',
+        'waeup.local.CourseAdviser400':'waeup.StudentsCourseAdviser400',
+        'waeup.local.CourseAdviser500':'waeup.StudentsCourseAdviser500',
+        'waeup.local.CourseAdviser600':'waeup.StudentsCourseAdviser600'
+        }
 
     def getRolesForPrincipal(self, principal_id):
@@ -102 +110 @@
                 principal_id)
             for role_id, setting in extra_roles:
-                if role_id in self.external_rolenames:
+                if role_id in self.rolename_mapping.keys():
                     # Found role in external attribute or parent
                     # thereof. 'Grant' additional role
@@ -108 +116 @@
                     # passed in principal id.
                     result.append(
-                        (self.additional_rolename, setting))
+                        (self.rolename_mapping[role_id], setting))
                     return result
             obj = getattr(obj, '__parent__', None)