Changeset 14992 for main/waeup.kofa/trunk

Timestamp:

26 Apr 2018, 08:50:56 (7 years ago)

Author:

Henrik Bettermann

Message:

Allow lecturer role assignment also at department level.

Location:

main/waeup.kofa/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• src/waeup/kofa/browser/pages.py (modified) (2 diffs)
• src/waeup/kofa/browser/templates/mycourses.pt (modified) (1 diff)
• src/waeup/kofa/permissions.py (modified) (2 diffs)
• src/waeup/kofa/students/tests/test_browser.py (modified) (2 diffs)
• src/waeup/kofa/university/department.py (modified) (1 diff)

main/waeup.kofa/trunk/CHANGES.txt

@@ -5 +5 @@
 =======================
 
-* No changes yet.
+* Allow lecturer role assignment also at department level.
 
 1.6 (2018-04-05)

main/waeup.kofa/trunk/src/waeup/kofa/browser/pages.py

@@ -61 +61 @@
     IPasswordValidator, IContactForm, IKofaUtils, ICSVExporter,
     academic_sessions_vocab, DOCLINK, registration_states_vocab)
+from waeup.kofa.university.department import Department
+from waeup.kofa.university.course import Course
 from waeup.kofa.permissions import (
     get_users_with_local_roles, get_all_roles, get_all_users,
@@ -1011 +1013 @@
     @property
     def getCourses(self):
+        courses = []
         local_roles = get_user_account(self.request).getLocalRoles()
-        return local_roles['waeup.local.Lecturer']
+        for item in local_roles.get('waeup.local.Lecturer', []):
+            if isinstance(item, Course):
+                courses.append(item)
+            elif isinstance(item, Department):
+                courses += [i for i in item.courses.values()]
+        return courses
 
 #

main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/mycourses.pt

@@ -5 +5 @@
 <div tal:repeat="course view/getCourses">
     <a tal:attributes="href python:view.url(course)">
-      <span tal:content="course/title">ROLE</span>
-      (<span tal:content="course/code">ROLE</span>)
+      <span tal:content="python:course.__parent__.__parent__.__parent__.code">FAC</span> /
+      <span tal:content="python:course.__parent__.__parent__.code">DEP</span> /
+      <span tal:content="course/longtitle">COURSE</span>
     </a>
 </div>

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

@@ -205 +205 @@
 
 
+class DepartmentOfficer(grok.Role):
+    """The local DepartmentOfficer role can be assigned at faculty or
+    department level. The role allows to list all student data within the
+    faculty/department the local role is assigned.
+    """
+    grok.name('waeup.local.DepartmentOfficer')
+    grok.title(u'Department Officer')
+    grok.permissions('waeup.showStudents',
+                     'waeup.viewAcademics',
+                     'waeup.exportPaymentsOverview')
+
+
 class DepartmentManager(grok.Role):
     """The local DepartmentManager role can be assigned at faculty or
@@ -218 +230 @@
                      'waeup.showStudents',
                      'waeup.exportData')
-
-
-class DepartmentOfficer(grok.Role):
-    """The local DepartmentOfficer role can be assigned at faculty or
-    department level. The role allows to list all student data within the
-    faculty/department the local role is assigned.
-
-    Department Managers (Dean of Faculty or Head of Department respectively)
-    can also list student data but not access student pages. They can
-    furthermore export payment overviews.
-    """
-    grok.name('waeup.local.DepartmentOfficer')
-    grok.title(u'Department Officer')
-    grok.permissions('waeup.showStudents',
-                     'waeup.viewAcademics',
-                     'waeup.exportPaymentsOverview')
 
 

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

@@ -3980 +3980 @@
         self.student['studycourse'].addStudentStudyLevel(
             self.certificate, studylevel)
-        # Assign local Lecturer role for a certificate.
+        # Assign local Lecturer role for a course.
         course = self.app['faculties']['fac1']['dep1'].courses['COURSE1']
         prmlocal = IPrincipalRoleManager(course)
@@ -4011 +4011 @@
         self.assertMatches('...You logged in...', self.browser.contents)
         self.assertEqual(self.browser.url, URL_LECTURER_LANDING)
+        self.assertTrue(
+            "<span>Unnamed Course (COURSE1)</span>"
+            in self.browser.contents)
+
+    def test_lecturer_department_role(self):
+        # lecturers can login and will be led to landing page also if
+        # role is assigned at department level.
+        self.login_as_lecturer()
+        # we remove the role granted above
+        course = self.app['faculties']['fac1']['dep1'].courses['COURSE1']
+        prmlocal = IPrincipalRoleManager(course)
+        prmlocal.removeRoleFromPrincipal('waeup.local.Lecturer', 'mrslecturer')
+        notify(LocalRoleSetEvent(
+            course, 'waeup.local.Lecturer', 'mrslecturer', granted=False))
+        self.browser.open(URL_LECTURER_LANDING)
+        # no course appears
+        self.assertFalse(
+            "<span>Unnamed Course (COURSE1)</span>"
+            in self.browser.contents)
+        # we assign lecturer at department level
+        dep = self.app['faculties']['fac1']['dep1']
+        prmlocal = IPrincipalRoleManager(dep)
+        prmlocal.assignRoleToPrincipal('waeup.local.Lecturer', 'mrslecturer')
+        notify(LocalRoleSetEvent(
+            dep, 'waeup.local.Lecturer', 'mrslecturer', granted=True))
+        self.browser.open(URL_LECTURER_LANDING)
+        # course appears again
+        self.assertTrue(
+            "<span>Unnamed Course (COURSE1)</span>"
+            in self.browser.contents)
 
     def test_my_roles_link_works(self):

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

@@ -58 +58 @@
         'waeup.local.CourseAdviser800',
         'waeup.local.LocalStudentsManager',
+        'waeup.local.Lecturer',
         ]