Changeset 9924

Timestamp:

30 Jan 2013, 08:58:37 (12 years ago)

Author:

Henrik Bettermann

Message:

Add new permission waeup.editStudyLevel to allow course advisers to edit study levels after rejection.

Improve logging. Creation and deletion of course tickets is now properly logged.

Location:

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

Files:

• browser.py (modified) (4 diffs)
• permissions.py (modified) (3 diffs)
• tests/test_browser.py (modified) (5 diffs)
• viewlets.py (modified) (1 diff)

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

@@ -158 +158 @@
     view.flash(_('Successfully added ${a}.',
         mapping = {'a':ticket.code}))
+    view.context.writeLogMessage(
+        view,'added: %s|%s|%s' % (
+        ticket.code, ticket.getLevel(), ticket.getLevelSession()))
     return True
 
@@ -1257 +1260 @@
                 mapping = {'a':', '.join(deleted)}))
             self.context.writeLogMessage(
-                self,'removed: %s' % ', '.join(deleted))
+                self,'removed: %s at %s' %
+                (', '.join(deleted), self.context.level))
         self.redirect(self.url(self.context, u'@@manage')+'?tab2')
         return
@@ -2317 +2321 @@
     grok.context(IStudentStudyLevel)
     grok.name('edit')
-    grok.require('waeup.handleStudent')
+    grok.require('waeup.editStudyLevel')
     grok.template('studyleveleditpage')
     form_fields = grok.AutoFields(IStudentStudyLevel).omit(
@@ -2381 +2385 @@
                 mapping = {'a':', '.join(deleted)}))
             self.context.writeLogMessage(
-                self,'removed: %s' % ', '.join(deleted))
+                self,'removed: %s at %s' %
+                (', '.join(deleted), self.context.level))
         self.redirect(self.url(self.context, u'@@edit'))
         return

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

@@ -56 +56 @@
     grok.name('waeup.validateStudent')
 
+class EditStudyLevel(grok.Permission):
+    grok.name('waeup.editStudyLevel')
+
 class TriggerTransition(grok.Permission):
     grok.name('waeup.triggerTransition')
@@ -68 +71 @@
     grok.permissions('waeup.handleStudent', 'waeup.uploadStudentFile',
                      'waeup.viewStudent', 'waeup.payStudent',
-                     'waeup.handleAccommodation')
+                     'waeup.handleAccommodation', 'waeup.editStudyLevel')
 
 # Site Roles
@@ -98 +101 @@
     grok.name('waeup.StudentsCourseAdviser')
     grok.title(u'Course Adviser (all students)')
-    grok.permissions('waeup.validateStudent','waeup.viewStudent')
+    grok.permissions('waeup.validateStudent','waeup.viewStudent',
+                     'waeup.editStudyLevel')
 
 class StudentImpersonator(grok.Role):

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_browser.py

@@ -750 +750 @@
         logcontent = open(logfile).read()
         self.assertTrue('zope.mgr - students.browser.StudyLevelManageFormPage '
-        '- K1000000 - removed: COURSE1' in logcontent)
+        '- K1000000 - removed: COURSE1 at 100' in logcontent)
         self.browser.getLink("here").click()
         self.browser.getControl(name="form.course").value = ['COURSE1']
@@ -1422 +1422 @@
             cert,studylevel)
         L110_student_path = self.studycourse_path + '/110'
-        # Only in state courses registered and only if the current level
-        # corresponds with the name of the study level object
-        # the 100L CA does see the 'Validate' button
+        # The CA can neither see the Validate nor the Edit button
         self.browser.open(L110_student_path)
         self.assertFalse('Validate courses' in self.browser.contents)
+        self.assertFalse('Edit' in self.browser.contents)
         IWorkflowInfo(self.student).fireTransition('register_courses')
         self.browser.open(L110_student_path)
         self.assertFalse('Validate courses' in self.browser.contents)
+        self.assertFalse('Edit' in self.browser.contents)
+        # Only in state courses registered and only if the current level
+        # corresponds with the name of the study level object
+        # the 100L CA does see the 'Validate' button but not
+        # the edit button
         self.student['studycourse'].current_level = 110
         self.browser.open(L110_student_path)
+        self.assertFalse('Edit' in self.browser.contents)
         self.assertTrue('Validate courses' in self.browser.contents)
-        # ... but a 100L CA does not see the button on other levels
+        # But a 100L CA does not see the button at other levels
         studylevel2 = StudentStudyLevel()
         studylevel2.level = 200
@@ -1440 +1445 @@
         L200_student_path = self.studycourse_path + '/200'
         self.browser.open(L200_student_path)
+        self.assertFalse('Edit' in self.browser.contents)
         self.assertFalse('Validate courses' in self.browser.contents)
         self.browser.open(L110_student_path)
@@ -1471 +1477 @@
         self.browser.getControl("Send message now").click()
         self.assertTrue('Your message has been sent' in self.browser.contents)
+        # The CA does now see the Edit button and can edit
+        # current study level
+        self.browser.open(L110_student_path)
+        self.browser.getLink("Edit").click()
+        self.assertTrue('Edit course list of 100 (Year 1) on 1st probation'
+            in self.browser.contents)
         # The CA can't validate courses if not in state
         # courses registered
@@ -2069 +2081 @@
         self.browser.getControl("Register course list").click()
         self.assertTrue('Maximum credits of 50 exceeded' in self.browser.contents)
-        # Student can now remove the ticket ...
+        # Student can now remove the ticket
         ctrl = self.browser.getControl(name='val_id')
         ctrl.getControl(value='COURSE1').selected = True
         self.browser.getControl("Remove selected", index=0).click()
         self.assertTrue('Successfully removed' in self.browser.contents)
-        # ... and add the same ticket using the edit page directly.
+        # Removing course tickets is properly logged
+        logfile = os.path.join(
+            self.app['datacenter'].storage, 'logs', 'students.log')
+        logcontent = open(logfile).read()
+        self.assertTrue('K1000000 - students.browser.StudyLevelEditFormPage '
+        '- K1000000 - removed: COURSE1 at 200' in logcontent)
+        # They can add the same ticket using the edit page directly.
         # We can do the same by adding the course on the manage page directly
         self.browser.getControl(name="course").value = 'COURSE1'
         self.browser.getControl("Add course ticket").click()
+        # Adding course tickets is logged
+        logfile = os.path.join(
+            self.app['datacenter'].storage, 'logs', 'students.log')
+        logcontent = open(logfile).read()
+        self.assertTrue('K1000000 - students.browser.StudyLevelEditFormPage - '
+            'K1000000 - added: COURSE1|200|2004' in logcontent)
         # Course list can be registered
         self.browser.getControl("Register course list").click()

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

@@ -583 +583 @@
     grok.context(IStudentStudyLevel)
     grok.view(StudyLevelDisplayFormPage)
-    grok.require('waeup.handleStudent')
+    grok.require('waeup.editStudyLevel')
     text = _('Edit course list')
     target = 'edit'