Changeset 10226

Timestamp:

24 May 2013, 17:54:10 (12 years ago)

Author:

Henrik Bettermann

Message:

Add local and global ApplicationsManager? role. Assign role dynamically.

Location:

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

Files:

• applicants/dynamicroles.py (modified) (1 diff)
• applicants/permissions.py (modified) (1 diff)
• applicants/tests/test_browser.py (modified) (1 diff)
• applicants/tests/test_dynamicroles.py (modified) (2 diffs)
• browser/browser.txt (modified) (1 diff)
• permissions.py (modified) (1 diff)
• permissions.txt (modified) (2 diffs)
• students/tests/test_dynamicroles.py (modified) (1 diff)
• university/department.py (modified) (1 diff)

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

@@ -42 +42 @@
     # role to add in case this role was found
     rolename_mapping = {
-        'waeup.local.ClearanceOfficer':'waeup.ApplicationsOfficer',
+        'waeup.local.ApplicationsManager':'waeup.ApplicationsManager',
         }
 

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

@@ -60 +60 @@
 class ApplicationsOfficer(grok.Role):
     grok.name('waeup.ApplicationsOfficer')
-    grok.title(u'Applications Officer')
+    grok.title(u'Applications Officer (view only)')
+    grok.permissions('waeup.viewApplication', 'waeup.viewApplicantsTab')
+
+class ApplicationsManager(grok.Role):
+    grok.name('waeup.ApplicationsManager')
+    grok.title(u'Applications Manager')
     grok.permissions('waeup.manageApplication', 'waeup.viewApplication',
                      'waeup.viewApplicantsTab', 'waeup.payApplicant')

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

@@ -297 +297 @@
         return
 
-    # We have no local roles yet
-    #def test_local_roles_add_delete(self):
-    #    # Managers can assign and delete local roles of applicants root
-    #    myusers = self.app['users']
-    #    myusers.addUser('bob', 'bobssecret')
-    #    self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
-    #    self.browser.open(self.manage_root_path)
-    #    self.browser.getControl(name="user").value = ['bob']
-    #    self.browser.getControl(name="local_role").value = [
-    #        'waeup.local.ApplicationsOfficer']
-    #    self.browser.getControl("Add local role").click()
-    #    self.assertTrue('<td>bob</td>' in self.browser.contents)
-    #    # Remove the role assigned
-    #    ctrl = self.browser.getControl(name='role_id')
-    #    ctrl.getControl(value='bob|waeup.ApplicationsOfficer').selected = True
-    #    self.browser.getControl("Remove selected local roles").click()
-    #    self.assertTrue('Successfully removed:' in self.browser.contents)
-    #    self.assertFalse('<td>bob</td>' in self.browser.contents)
-    #    return
+    def test_local_roles_add_delete(self):
+        # Managers can assign and delete local roles of applicants root
+        myusers = self.app['users']
+        myusers.addUser('bob', 'bobssecret')
+        self.browser.addHeader('Authorization', 'Basic mgr:mgrpw')
+        self.browser.open('http://localhost/app/faculties/fac1/dep1/manage')
+        self.browser.getControl(name="user").value = ['bob']
+        self.browser.getControl(name="local_role").value = [
+            'waeup.local.ApplicationsManager']
+        self.browser.getControl("Add local role").click()
+        self.assertTrue('<td>bob</td>' in self.browser.contents)
+        # Remove the role assigned
+        ctrl = self.browser.getControl(name='role_id')
+        ctrl.getControl(
+            value='bob|waeup.local.ApplicationsManager').selected = True
+        self.browser.getControl("Remove selected local roles").click()
+        self.assertTrue(
+            'Local role successfully removed: bob|waeup.local.ApplicationsManager'
+            in self.browser.contents)
+        self.assertFalse('<td>bob</td>' in self.browser.contents)
+        return
 
     def test_add_delete_container(self):

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

@@ -47 +47 @@
         super(ApplicantPrincipalRoleManagerFunctionalTests, self).setUp()
         self.applicant.course1 = self.certificate
-        self.officer_role = 'waeup.ApplicationsOfficer'
-        # assign clearance permissions for a virtual officer
+        # assign application manage permissions for a virtual officer
         prm = IPrincipalRoleManager(self.department)
-        prm.assignRoleToPrincipal('waeup.local.ClearanceOfficer', 'alice')
+        prm.assignRoleToPrincipal('waeup.local.ApplicationsManager', 'alice')
         return
 
@@ -78 +77 @@
 
     def test_valid_officer(self):
-        # for an officer that has clearance role on the connected dept
-        # we get the ApplicationsOfficer role on our applicant
+        # for an officer that has application manage permissions
+        # on the connected dept
+        # we get the ApplicationsManager role on our applicant
         prm = IPrincipalRoleManager(self.applicant)
         result = prm.getRolesForPrincipal('alice')
-        self.assertEqual(result, [('waeup.ApplicationsOfficer', Allow)])
+        self.assertEqual(result, [('waeup.ApplicationsManager', Allow)])
         return

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

@@ -217 +217 @@
   >>> print browser.contents
   <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"...
-  ...<td nowrap>Applications Officer <br /></td>
+  ...<td nowrap>Applications Officer (view only) <br /></td>
   ...
 

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

@@ -78 +78 @@
 
 # Local Roles
+class ApplicationsManager(grok.Role):
+    grok.name('waeup.local.ApplicationsManager')
+    grok.title(u'Applications Manager')
+    grok.permissions('waeup.viewAcademics')
+
 class DepartmentManager(grok.Role):
     grok.name('waeup.local.DepartmentManager')

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

@@ -39 +39 @@
     >>> from waeup.kofa.permissions import get_waeup_roles
     >>> len(list(get_waeup_roles()))
-    20
+    21
 
     >>> len(list(get_waeup_roles(also_local=True)))
-    36
+    38
 
 
@@ -58 +58 @@
      u'waeup.AccommodationOfficer',
      u'waeup.Applicant',
+     u'waeup.ApplicationsManager',
      u'waeup.ApplicationsOfficer',
      u'waeup.CCOfficer',

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

@@ -82 +82 @@
     def test_valid_officer(self):
         # for an officer that has clearance role on the connected dept
-        # we get the ApplicationsOfficer role on our student
+        # we get the ClearanceOfficer role on our student
         prm = IPrincipalRoleManager(self.student)
         result = prm.getRolesForPrincipal('alice')

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

@@ -39 +39 @@
 
     local_roles = [
+        'waeup.local.ApplicationsManager',
         'waeup.local.DepartmentManager',
         'waeup.local.ClearanceOfficer',