Changeset 9211 for main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/permissions.py

Timestamp:

21 Sep 2012, 08:19:35 (12 years ago)

Author:

uli

Message:

Rollback r9209. Looks like multiple merges from trunk confuse svn when merging back into trunk.

Location:

main/waeup.kofa/branches/uli-zc-async

Files:

• . (modified) (1 prop)
• src/waeup/kofa/permissions.py (modified) (3 diffs)

main/waeup.kofa/branches/uli-zc-async/src/waeup/kofa/permissions.py

@@ -88 +88 @@
     grok.permissions('waeup.showStudents', 'waeup.viewAcademics')
 
-class UGClearanceOfficer(grok.Role):
-    """The clearance officer role is meant for the
-    assignment of dynamic roles only.
-    """
-    grok.name('waeup.local.UGClearanceOfficer')
-    grok.title(u'UG Clearance Officer')
-    grok.permissions('waeup.showStudents', 'waeup.viewAcademics')
-
-class PGClearanceOfficer(grok.Role):
-    """The clearance officer role is meant for the
-    assignment of dynamic roles only.
-    """
-    grok.name('waeup.local.PGClearanceOfficer')
-    grok.title(u'PG Clearance Officer')
-    grok.permissions('waeup.showStudents', 'waeup.viewAcademics')
-
 class CourseAdviser100(grok.Role):
     """The 100 level course adviser role is meant for the
@@ -150 +134 @@
     grok.name('waeup.local.CourseAdviser600')
     grok.title(u'Course Adviser 600L')
-    grok.permissions('waeup.showStudents', 'waeup.viewAcademics')
-
-class Lecturer(grok.Role):
-    """The lecturer role is meant for the
-    assignment of dynamic roles only.
-    """
-    grok.name('waeup.local.Lecturer')
-    grok.title(u'Lecturer')
     grok.permissions('waeup.showStudents', 'waeup.viewAcademics')
 
@@ -213 +189 @@
                      'waeup.uploadStudentFile', 'waeup.showStudents',
                      'waeup.viewStudentsContainer','waeup.viewStudentsTab',
-                     'waeup.handleAccommodation',
                      'waeup.viewHostels', 'waeup.manageHostels',
                      'waeup.editUser'