Changeset 13051 for main/waeup.aaue/trunk/src

Timestamp:

15 Jun 2015, 15:04:19 (9 years ago)

Author:

Henrik Bettermann

Message:

Student are always allowed to download course registration slips of passed sessions.

Location:

main/waeup.aaue/trunk/src/waeup/aaue/students

Files:

• browser.py (modified) (1 diff)
• tests/test_browser.py (modified) (2 diffs)
• viewlets.py (modified) (1 diff)

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

@@ -108 +108 @@
     def update(self):
         if self.context.student.state != REGISTERED \
-            or self.context.student.current_level != self.context.level:
+            and self.context.student.current_level == self.context.level:
             self.flash(_('Forbidden'), type="warning")
             self.redirect(self.url(self.context))

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

@@ -421 +421 @@
 
     def test_student_course_registration(self):
-        # Uniben students see grade instead of score on all level pages
-        # and on course ticket page.
         IWorkflowState(self.student).setState('school fee paid')
         self.browser.open(self.login_path)
@@ -434 +432 @@
                            self.browser.contents)
         self.browser.getControl("Create course list now").click()
-        # Students can open the customized pdf course registration slip
-        # if they have registered their course list
+        # Students can't open the customized pdf course registration slip
         self.browser.open(
             self.student_path + '/studycourse/100/course_registration_slip.pdf')
         self.assertTrue('Forbidden' in self.browser.contents)
+        # They can open slips from the previous session ...
+        self.student['studycourse'].current_level = 200
+        self.browser.open(self.student_path + '/studycourse/100')
+        self.browser.getLink("Download course registration slip").click()
+        self.assertEqual(self.browser.headers['Status'], '200 Ok')
+        self.assertEqual(self.browser.headers['Content-Type'], 'application/pdf')
+        # or if they have registered their course list
+        self.student['studycourse'].current_level = 200
         IWorkflowState(self.student).setState('courses registered')
         self.browser.open(self.student_path + '/studycourse/100')

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

@@ -93 +93 @@
             return ''
         if self.context.student.state != REGISTERED \
-            or self.context.student.current_level != self.context.level:
+            and self.context.student.current_level == self.context.level:
             return ''
         return self.view.url(self.view.context, self.target)