Changeset 7136

Timestamp:

19 Nov 2011, 08:20:47 (13 years ago)

Author:

Henrik Bettermann

Message:

Rename permissions and add clearStudent permission.

Location:

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

Files:

• applicants/browser.py (modified) (11 diffs, 1 prop)
• applicants/permissions.py (modified) (2 diffs, 1 prop)
• permissions.py (modified) (3 diffs, 1 prop)
• students/browser.py (modified) (17 diffs)
• students/permissions.py (modified) (2 diffs)
• students/viewlets.py (modified) (1 diff)

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

@@ -95 +95 @@
     grok.context(IApplicantsRoot)
     grok.view(ApplicantsRootPage)
-    grok.require('waeup.manageApplications')
+    grok.require('waeup.manageApplication')
     text = 'Manage application section'
 
@@ -105 +105 @@
     label = 'Manage application section'
     pnav = 3
-    grok.require('waeup.manageApplications')
+    grok.require('waeup.manageApplication')
     taboneactions = ['Add applicants container', 'Remove selected','Cancel']
     tabtwoactions1 = ['Remove selected local roles']
@@ -170 +170 @@
 class ApplicantsContainerAddFormPage(WAeUPAddFormPage):
     grok.context(IApplicantsRoot)
-    grok.require('waeup.manageApplications')
+    grok.require('waeup.manageApplication')
     grok.name('add')
     grok.template('applicantscontaineraddpage')
@@ -276 +276 @@
     grok.context(IApplicantsContainer)
     grok.view(ApplicantsContainerPage)
-    grok.require('waeup.manageApplications')
+    grok.require('waeup.manageApplication')
     text = 'Manage applicants container'
 
@@ -300 +300 @@
     form_fields['startdate'].custom_widget = FriendlyDateWidget('le')
     form_fields['enddate'].custom_widget = FriendlyDateWidget('le')
-    grok.require('waeup.manageApplications')
+    grok.require('waeup.manageApplication')
 
     @property
@@ -467 +467 @@
     """
     grok.context(IApplicantsContainer)
-    grok.require('waeup.manageApplications')
+    grok.require('waeup.manageApplication')
     grok.name('addapplicant')
     grok.template('applicantaddpage')
@@ -582 +582 @@
 class PDFActionButton(ManageActionButton):
     grok.context(IApplicant)
-    grok.require('waeup.manageApplications')
+    grok.require('waeup.viewApplication')
     icon = 'actionicon_pdf.png'
     text = 'Download application slip'
@@ -592 +592 @@
     grok.context(IApplicant)
     grok.name('application_slip.pdf')
-    grok.require('waeup.handleApplication')
+    grok.require('waeup.viewApplication')
     form_fields = grok.AutoFields(IApplicant).omit(
         'locked').omit('course_admitted')
@@ -693 +693 @@
     grok.context(IApplicant)
     grok.view(DisplayApplicant)
-    grok.require('waeup.manageApplications')
+    grok.require('waeup.manageApplication')
     text = 'Manage application record'
     target = 'edit_full'
@@ -721 +721 @@
     grok.context(IApplicant)
     grok.name('edit_full')
-    grok.require('waeup.manageApplications')
+    grok.require('waeup.manageApplication')
     form_fields = grok.AutoFields(IApplicant)
     form_fields['date_of_birth'].custom_widget = FriendlyDateWidget('le-year')
@@ -849 +849 @@
     grok.context(IApplicant)
     grok.view(EditApplicantFull)
-    grok.require('waeup.manageApplications')
+    grok.require('waeup.manageApplication')
     icon = 'actionicon_view.png'
     text = 'View application record'

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

@@ -33 +33 @@
     grok.name('waeup.viewApplication')
 
-class ManageApplications(grok.Permission):
-    grok.name('waeup.manageApplications')
+class ManageApplication(grok.Permission):
+    grok.name('waeup.manageApplication')
 
 # Local role
@@ -46 +46 @@
     grok.name('waeup.ApplicationsOfficer')
     grok.title(u'Applications Officer')
-    grok.permissions('waeup.manageApplications', 'waeup.viewApplication')
+    grok.permissions('waeup.manageApplication', 'waeup.viewApplication')

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

@@ -46 +46 @@
     grok.name('waeup.local.ClearanceOfficer')
     grok.title(u'Clearance Officer')
-    # to be further defined
     grok.permissions('waeup.View', 'waeup.Public')
 
@@ -52 +51 @@
     grok.name('waeup.local.CourseAdviser')
     grok.title(u'Course Adviser')
-    # to be further defined
     grok.permissions('waeup.View', 'waeup.Public')
 
@@ -69 +67 @@
                      'waeup.managePortalConfiguration',
                      'waeup.manageApplications', 'waeup.handleApplication',
-                     'waeup.viewStudent', 'waeup.manageStudents',
+                     'waeup.viewStudent', 'waeup.manageStudent', 'clearStudent'
                      'waeup.viewHostels', 'waeup.manageHostels')
 

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

@@ -260 +260 @@
     grok.context(IStudentsContainer)
     grok.view(StudentsContainerPage)
-    grok.require('waeup.manageStudents')
+    grok.require('waeup.manageStudent')
     text = 'Manage student section'
 
@@ -269 +269 @@
     grok.context(IStudentsContainer)
     grok.name('manage')
-    grok.require('waeup.manageStudents')
+    grok.require('waeup.manageStudent')
     grok.template('containermanagepage')
     pnav = 4
@@ -317 +317 @@
     grok.context(IStudentsContainer)
     grok.view(StudentsContainerManagePage)
-    grok.require('waeup.manageStudents')
+    grok.require('waeup.manageStudent')
     text = 'Add student'
     target = 'addstudent'
@@ -325 +325 @@
     """
     grok.context(IStudentsContainer)
-    grok.require('waeup.manageStudents')
+    grok.require('waeup.manageStudent')
     grok.name('addstudent')
     grok.template('studentaddpage')
@@ -367 +367 @@
     grok.context(IStudent)
     grok.view(StudentBaseDisplayFormPage)
-    grok.require('waeup.manageStudents')
+    grok.require('waeup.manageStudent')
     text = 'Manage'
     target = 'manage_base'
@@ -376 +376 @@
     grok.context(IStudent)
     grok.name('manage_base')
-    grok.require('waeup.manageStudents')
+    grok.require('waeup.manageStudent')
     form_fields = grok.AutoFields(IStudentBase).omit('student_id')
     grok.template('basemanagepage')
@@ -463 +463 @@
     grok.context(IStudent)
     grok.view(StudentClearanceDisplayFormPage)
-    grok.require('waeup.manageStudents')
+    grok.require('waeup.manageStudent')
     text = 'Manage'
     target = 'edit_clearance'
@@ -472 +472 @@
     grok.context(IStudent)
     grok.name('edit_clearance')
-    grok.require('waeup.manageStudents')
+    grok.require('waeup.manageStudent')
     grok.template('clearanceeditpage')
     form_fields = grok.AutoFields(IStudentClearance)
@@ -508 +508 @@
     grok.context(IStudent)
     grok.view(StudentPersonalDisplayFormPage)
-    grok.require('waeup.manageStudents')
+    grok.require('waeup.manageStudent')
     text = 'Manage'
     target = 'edit_personal'
@@ -552 +552 @@
     grok.context(IStudentStudyCourse)
     grok.view(StudyCourseDisplayFormPage)
-    grok.require('waeup.manageStudents')
+    grok.require('waeup.manageStudent')
     text = 'Manage'
     target = 'manage'
@@ -561 +561 @@
     grok.context(IStudentStudyCourse)
     grok.name('manage')
-    grok.require('waeup.manageStudents')
+    grok.require('waeup.manageStudent')
     grok.template('studycoursemanagepage')
     form_fields = grok.AutoFields(IStudentStudyCourse)
@@ -684 +684 @@
     grok.context(IStudentStudyLevel)
     grok.view(StudyLevelDisplayFormPage)
-    grok.require('waeup.manageStudents')
+    grok.require('waeup.manageStudent')
     text = 'Manage'
     target = 'manage'
@@ -693 +693 @@
     grok.context(IStudentStudyLevel)
     grok.name('manage')
-    grok.require('waeup.manageStudents')
+    grok.require('waeup.manageStudent')
     grok.template('studylevelmanagepage')
     form_fields = grok.AutoFields(IStudentStudyLevel)
@@ -752 +752 @@
     grok.context(IStudentStudyLevel)
     grok.name('add')
-    grok.require('waeup.manageStudents')
+    grok.require('waeup.manageStudent')
     label = 'Add course ticket'
     form_fields = grok.AutoFields(ICourseTicketAdd).omit(
@@ -811 +811 @@
     grok.context(ICourseTicket)
     grok.view(CourseTicketDisplayFormPage)
-    grok.require('waeup.manageStudents')
+    grok.require('waeup.manageStudent')
     text = 'Manage'
     target = 'manage'
@@ -820 +820 @@
     grok.context(ICourseTicket)
     grok.name('manage')
-    grok.require('waeup.manageStudents')
+    grok.require('waeup.manageStudent')
     form_fields = grok.AutoFields(ICourseTicket)
     grok.template('courseticketmanagepage')
@@ -932 +932 @@
 #    grok.context(IStudentPaymentsContainer)
 #    grok.view(PaymentsDisplayFormPage)
-#    grok.require('waeup.manageStudents')
+#    grok.require('waeup.manageStudent')
 #    text = 'Manage payments'
 #    target = 'manage'

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

@@ -33 +33 @@
     grok.name('waeup.uploadStudentFile')
 
-class ManageStudents(grok.Permission):
-    grok.name('waeup.manageStudents')
+class ManageStudent(grok.Permission):
+    grok.name('waeup.manageStudent')
+
+class ClearStudent(grok.Permission):
+    grok.name('waeup.clearStudent')
 
 # Local role
@@ -52 +55 @@
     grok.title(u'Students Officer')
     grok.permissions('waeup.View', 'waeup.Public',
-                     'waeup.viewStudent', 'waeup.manageStudents',
+                     'waeup.viewStudent', 'waeup.manageStudent',
                      'waeup.payStudent', 'waeup.uploadStudentFile')

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

@@ -340 +340 @@
     grok.context(IStudent)
     grok.view(StudentBaseManageFormPage)
-    grok.require('waeup.manageStudents')
+    grok.require('waeup.manageStudent')
     grok.template('imageupload')
     label = u'Passport Picture (jpg only):'