Changeset 10639

Timestamp:

22 Sep 2013, 08:54:03 (11 years ago)

Author:

Henrik Bettermann

Message:

Define new local roles (see uniben ticket 900).

Allow the dynamical assignment of multiple local roles.

Location:

main/waeup.kofa/trunk/src/waeup/kofa

Files:

• permissions.py (modified) (1 diff)
• permissions.txt (modified) (1 diff)
• students/dynamicroles.py (modified) (2 diffs)
• students/tests/test_dynamicroles.py (modified) (2 diffs)
• university/faculty.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/permissions.py

@@ -115 +115 @@
     grok.name('waeup.local.ClearanceOfficer')
     grok.title(u'Clearance Officer')
+    grok.permissions('waeup.showStudents',
+                     'waeup.viewAcademics',
+                     'waeup.exportData')
+
+class LocalStudentsManager(grok.Role):
+    """The local students manager role is meant for the
+    assignment of dynamic roles only.
+    """
+    grok.name('waeup.local.LocalStudentsManager')
+    grok.title(u'Students Manager')
+    grok.permissions('waeup.showStudents',
+                     'waeup.viewAcademics',
+                     'waeup.exportData')
+
+class LocalWorkflowManager(grok.Role):
+    """The local workflow manager role is meant for the
+    assignment of dynamic roles only.
+    """
+    grok.name('waeup.local.LocalWorkflowManager')
+    grok.title(u'Student Workflow Manager')
     grok.permissions('waeup.showStudents',
                      'waeup.viewAcademics',

main/waeup.kofa/trunk/src/waeup/kofa/permissions.txt

@@ -42 +42 @@
 
     >>> len(list(get_waeup_roles(also_local=True)))
-    40
+    42
 
 

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

@@ -44 +44 @@
     rolename_mapping = {
         'waeup.local.ClearanceOfficer':'waeup.StudentsClearanceOfficer',
+        'waeup.local.LocalStudentsManager': 'waeup.StudentsManager',
+        'waeup.local.LocalWorkflowManager': 'waeup.WorkflowManager',
         }
 
@@ -109 +111 @@
                     result.append(
                         (self.rolename_mapping[role_id], setting))
-                    return result
+                    # Local roles have been found, no need to climb up further.
+                    obj = None
             obj = getattr(obj, '__parent__', None)
         return result

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_dynamicroles.py

@@ -49 +49 @@
     def setUp(self):
         super(StudentPrincipalRoleManagerFunctionalTests, self).setUp()
-        # assign clearance permissions for a virtual officer
+        # assign permissions for a virtual officers
         prm = IPrincipalRoleManager(self.app['faculties']['fac1']['dep1'])
         prm.assignRoleToPrincipal('waeup.local.ClearanceOfficer', 'alice')
         prm.assignRoleToPrincipal('waeup.local.PGClearanceOfficer', 'bob')
         prm.assignRoleToPrincipal('waeup.local.UGClearanceOfficer', 'anne')
+        prm.assignRoleToPrincipal('waeup.local.LocalStudentsManager', 'benita')
+        prm.assignRoleToPrincipal('waeup.local.LocalWorkflowManager', 'benita')
         return
 
@@ -100 +102 @@
         result = prm.getRolesForPrincipal('anne')
         self.assertEqual(result, [('waeup.StudentsOfficer', Allow)])
+        # Multiple roles can be assigned
+        result = prm.getRolesForPrincipal('benita')
+        self.assertEqual(result, [
+            ('waeup.WorkflowManager', Allow),
+            ('waeup.StudentsManager', Allow)
+            ])
         return

main/waeup.kofa/trunk/src/waeup/kofa/university/faculty.py

@@ -54 +54 @@
         'waeup.local.CourseAdviser700',
         'waeup.local.CourseAdviser800',
+        'waeup.local.LocalStudentsManager',
+        'waeup.local.LocalWorkflowManager',
         ]