Changeset 7168

Timestamp:

22 Nov 2011, 14:11:25 (13 years ago)

Author:

Henrik Bettermann

Message:

Reorganize permissions a bit.

Location:

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

Files:

• permissions.py (modified) (1 diff)
• permissions.txt (modified) (2 diffs)
• students/permissions.py (modified) (2 diffs)

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

@@ -44 +44 @@
     grok.name('waeup.local.DepartmentOfficer')
     grok.title(u'Department Officer')
-    grok.permissions('waeup.manageUniversity','waeup.View', 'waeup.Public')
+    grok.permissions('waeup.manageUniversity')
+
 
 class ClearanceOfficer(grok.Role):
+    """The clearance officer role is meant for the
+    assignment of dynamic roles only.
+    """
     grok.name('waeup.local.ClearanceOfficer')
     grok.title(u'Clearance Officer')
-    grok.permissions('waeup.View', 'waeup.Public')
 
 class CourseAdviser(grok.Role):
+    """The course adviser role is meant for the
+    assignment of dynamic roles only.
+    """
     grok.name('waeup.local.CourseAdviser')
     grok.title(u'Course Adviser')
-    grok.permissions('waeup.View', 'waeup.Public')
 
 class Owner(grok.Role):

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

@@ -39 +39 @@
     >>> from waeup.sirp.permissions import getWAeUPRoles
     >>> len(list(getWAeUPRoles()))
-    8
+    9
 
     >>> len(list(getWAeUPRoles(also_local=True)))
-    14
+    15
 
 
@@ -53 +53 @@
     >>> from waeup.sirp.permissions import getWAeUPRoleNames
     >>> list(getWAeUPRoleNames())
-    [u'waeup.AccommodationOfficer', u'waeup.ApplicationsOfficer',
+    [u'waeup.AccommodationOfficer', u'waeup.Applicant',
+     u'waeup.ApplicationsOfficer',
      u'waeup.PortalManager', u'waeup.PortalUser', u'waeup.Student',
      u'waeup.StudentsClearanceOfficer', u'waeup.StudentsManager',

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

@@ -54 +54 @@
     grok.name('waeup.StudentsOfficer')
     grok.title(u'Students Officer (view only)')
-    grok.permissions('waeup.View', 'waeup.Public',
-                     'waeup.viewStudent',)
+    grok.permissions('waeup.viewStudent',)
 
 class StudentsManager(grok.Role):
     grok.name('waeup.StudentsManager')
     grok.title(u'Students Manager')
-    grok.permissions('waeup.View', 'waeup.Public',
-                     'waeup.viewStudent', 'waeup.manageStudent',
+    grok.permissions('waeup.viewStudent', 'waeup.manageStudent',
                      'waeup.payStudent', 'waeup.uploadStudentFile')
 
@@ -67 +65 @@
     grok.name('waeup.StudentsClearanceOfficer')
     grok.title(u'Clearance Officer (all students)')
-    grok.permissions('waeup.View', 'waeup.Public', 'waeup.clearStudent')
+    grok.permissions('waeup.clearStudent')