Changeset 7181 for main

Timestamp:

24 Nov 2011, 05:52:34 (13 years ago)

Author:

Henrik Bettermann

Message:

StudentsOfficers? are not allowed to view the accommodation and payments containers of students. We therefore use the dedicated permissions waeup.handleAccommodation and waeup.payStudent.

Add role waeup.ACManager with permission waeup.manageACBatches which has already been uses in accesscodes.

Location:

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

Files:

• accesscodes/accesscode.py (modified) (1 diff)
• permissions.py (modified) (2 diffs)
• permissions.txt (modified) (3 diffs)
• students/browser.py (modified) (9 diffs)
• students/permissions.py (modified) (3 diffs)
• students/viewlets.py (modified) (2 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/accesscodes/accesscode.py

@@ -19 +19 @@
     )
 from waeup.sirp.accesscodes.workflow import DISABLED, USED
-
-class ManageACBatches(grok.Permission):
-    grok.name('waeup.manageACBatches')
 
 class AccessCode(grok.Model):

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

@@ -41 +41 @@
     grok.name('waeup.managePortalConfiguration')
 
+class ManageACBatches(grok.Permission):
+    grok.name('waeup.manageACBatches')
+
 # Local Roles
 class DepartmentOfficer(grok.Role):
@@ -72 +75 @@
     grok.title(u'Portal User')
     grok.permissions('waeup.View', 'waeup.Public')
+
+class ACManager(grok.Role):
+    grok.name('waeup.ACManager')
+    grok.title(u'Access Code Manager')
+    grok.permissions('waeup.manageACBatches')
 
 class PortalManager(grok.Role):

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

@@ -29 +29 @@
 
     >>> sorted(list(getAllRoles()))
-    [(u'waeup.AccommodationOfficer', <waeup.sirp.hostels.permissions.AccommodationOfficer object at 0x...]
+    [(u'waeup.ACManager', <waeup.sirp.permissions.ACManager object at 0x...]
 
 :func:`getWAeUPRoles`
@@ -39 +39 @@
     >>> from waeup.sirp.permissions import getWAeUPRoles
     >>> len(list(getWAeUPRoles()))
-    9
+    10
 
     >>> len(list(getWAeUPRoles(also_local=True)))
-    15
+    16
 
 
@@ -53 +53 @@
     >>> from waeup.sirp.permissions import getWAeUPRoleNames
     >>> list(getWAeUPRoleNames())
-    [u'waeup.AccommodationOfficer', u'waeup.Applicant',
+    [u'waeup.ACManager', u'waeup.AccommodationOfficer', u'waeup.Applicant',
      u'waeup.ApplicationsOfficer',
      u'waeup.PortalManager', u'waeup.PortalUser', u'waeup.Student',

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

@@ -948 +948 @@
     grok.context(IStudentPaymentsContainer)
     grok.name('index')
-    grok.require('waeup.handleStudent')
+    grok.require('waeup.payStudent')
     form_fields = grok.AutoFields(IStudentPaymentsContainer)
     grok.template('paymentsmanagepage')
@@ -1018 +1018 @@
     grok.context(IStudentPaymentsContainer)
     grok.name('addop')
-    grok.require('waeup.handleStudent')
+    grok.require('waeup.payStudent')
     form_fields = grok.AutoFields(IStudentOnlinePayment).select(
         'p_category')
@@ -1110 +1110 @@
     grok.context(IStudentOnlinePayment)
     grok.view(OnlinePaymentDisplayFormPage)
-    grok.require('waeup.handleStudent')
+    grok.require('waeup.payStudent')
     icon = 'actionicon_call.png'
     text = 'Request callback'
@@ -1218 +1218 @@
     grok.context(IStudentAccommodation)
     grok.name('index')
-    grok.require('waeup.handleStudent')
+    grok.require('waeup.handleAccommodation')
     form_fields = grok.AutoFields(IStudentAccommodation)
     grok.template('accommodationmanagepage')
@@ -1283 +1283 @@
     grok.context(IStudentAccommodation)
     grok.view(AccommodationManageFormPage)
-    grok.require('waeup.handleStudent')
+    grok.require('waeup.handleAccommodation')
     icon = 'actionicon_home.png'
     text = 'Book accommodation'
@@ -1293 +1293 @@
     grok.context(IStudentAccommodation)
     grok.name('add')
-    grok.require('waeup.handleStudent')
+    grok.require('waeup.handleAccommodation')
     grok.template('enterpin')
     ac_prefix = 'HOS'
@@ -1384 +1384 @@
     grok.context(IBedTicket)
     grok.name('index')
-    grok.require('waeup.viewStudent')
+    grok.require('waeup.handleAccommodation')
     form_fields = grok.AutoFields(IBedTicket)
     form_fields[
@@ -1402 +1402 @@
     grok.context(IBedTicket)
     grok.view(BedTicketDisplayFormPage)
-    grok.require('waeup.viewStudent')
+    grok.require('waeup.handleAccommodation')
     icon = 'actionicon_pdf.png'
     text = 'Download bed allocation slip'
@@ -1412 +1412 @@
     grok.context(IBedTicket)
     grok.name('bed_allocation.pdf')
-    grok.require('waeup.viewStudent')
+    grok.require('waeup.handleAccommodation')
     form_fields = grok.AutoFields(IBedTicket)
     form_fields['booking_date'].custom_widget = FriendlyDateDisplayWidget('le')

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

@@ -30 +30 @@
     grok.name('waeup.payStudent')
 
+class HandleAccommodation(grok.Permission):
+    grok.name('waeup.handleAccommodation')
+
 class UploadStudentFile(grok.Permission):
     grok.name('waeup.uploadStudentFile')
@@ -44 +47 @@
     grok.title(u'Student Record Owner')
     grok.permissions('waeup.handleStudent', 'waeup.uploadStudentFile',
-                     'waeup.viewStudent', 'waeup.payStudent')
+                     'waeup.viewStudent', 'waeup.payStudent',
+                     'waeup.handleAccommodation')
 
 # Site Roles
@@ -60 +64 @@
     grok.title(u'Students Manager')
     grok.permissions('waeup.viewStudent', 'waeup.manageStudent',
-                     'waeup.payStudent', 'waeup.uploadStudentFile')
+                     'waeup.payStudent', 'waeup.uploadStudentFile',
+                     'waeup.handleAccommodation')
 
 class StudentsClearanceOfficer(grok.Role):

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

@@ -63 +63 @@
 class StudentManagePaymentsLink(StudentManageLink):
     grok.order(4)
+    grok.require('waeup.payStudent')
     link = 'payments'
     text = u'Payments'
@@ -68 +69 @@
 class StudentManageAccommodationLink(StudentManageLink):
     grok.order(5)
+    grok.require('waeup.handleAccommodation')
     link = 'accommodation'
     text = u'Accommodation Data'