Changeset 10632 for main/waeup.kofa/trunk/src

Timestamp:

21 Sep 2013, 06:05:36 (11 years ago)

Author:

Henrik Bettermann

Message:

Add permission for score editing.

Location:

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

Files:

• permissions.py (modified) (4 diffs)
• students/browser.py (modified) (3 diffs)

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

@@ -59 +59 @@
     grok.name('waeup.showStudents')
 
+class EditScores(grok.Permission):
+    grok.name('waeup.editScores')
+
 class EditUser(grok.Permission):
     grok.name('waeup.editUser')
@@ -223 +226 @@
     grok.title(u'Lecturer')
     grok.permissions('waeup.showStudents',
+                     'waeup.editScores',
                      'waeup.viewAcademics',
                      'waeup.exportData')
@@ -301 +305 @@
                      'waeup.clearStudent', 'waeup.payStudent',
                      'waeup.uploadStudentFile', 'waeup.showStudents',
+                     'waeup.editScores',
                      'waeup.triggerTransition',
                      'waeup.viewStudentsContainer','waeup.viewStudentsTab',
@@ -333 +338 @@
                      'waeup.clearStudent', 'waeup.payStudent',
                      'waeup.uploadStudentFile', 'waeup.showStudents',
+                     'waeup.editScores',
                      #'waeup.triggerTransition',
                      'waeup.viewStudentsContainer','waeup.viewStudentsTab',

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

@@ -3047 +3047 @@
     """
     grok.context(ICourse)
-    grok.require('waeup.manageStudent')
+    grok.require('waeup.editScores')
     grok.name('edit_scores')
     grok.template('editscorespage')
@@ -3071 +3071 @@
         self.current_academic_session = grok.getSite()[
             'configuration'].current_academic_session
+        if not self.current_academic_session:
+            self.flash(_('Current academic session not set.'))
+            self.redirect(self.url(self.context))
+            return
         datatable.need()
         self.tickets = self._searchCatalog(self.current_academic_session)
@@ -3077 +3081 @@
         if not self.tickets:
             self.flash(_('No student found.'))
+            self.redirect(self.url(self.context))
             return
         if 'UPDATE' in form: