Changeset 7539 for main/waeup.sirp/trunk/src/waeup

Timestamp:

30 Jan 2012, 11:26:01 (13 years ago)

Author:

Henrik Bettermann

Message:

Lock CourseTicketAddFormPage2 if not in state school fee paid.

Location:

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

Files:

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

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

@@ -57 +57 @@
     )
 from waeup.sirp.students.catalog import search
-from waeup.sirp.students.workflow import (
+from waeup.sirp.students.workflow import (ADMITTED, PAID,
     CLEARANCE, REQUESTED, RETURNING, CLEARED, REGISTERED, VALIDATED)
 from waeup.sirp.students.studylevel import StudentStudyLevel, CourseTicket
@@ -1748 +1748 @@
 
     def update(self):
-        if self.context.getStudent().state != 'admitted':
+        if self.context.getStudent().state != ADMITTED:
             emit_lock_message(self)
             return
@@ -2021 +2021 @@
 
     def update(self):
-        if self.context.getStudent().state != 'school fee paid':
+        if self.context.getStudent().state != PAID:
             emit_lock_message(self)
             return
@@ -2070 +2070 @@
 
     def update(self):
+        if self.context.getStudent().state != PAID:
+            emit_lock_message(self)
+            return
         super(StudyLevelEditFormPage, self).update()
         datatable.need()
@@ -2131 +2134 @@
         'grade', 'score', 'core_or_elective', 'automatic')
 
+    def update(self):
+        if self.context.getStudent().state != PAID:
+            emit_lock_message(self)
+            return
+        super(CourseTicketAddFormPage2, self).update()
+        return
+
     @action('Add course ticket')
     def addCourseTicket(self, **data):
+        # Double bottom ...
+        if self.context.getStudent().state != PAID:
+            return
         ticket = CourseTicket()
         course = data['course']

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

@@ -399 +399 @@
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.url, self.personal_student_path)
-        self.browser.getLink("Manage").click()
+        self.browser.getLink("Edit").click()
         self.assertEqual(self.browser.headers['Status'], '200 Ok')
         self.assertEqual(self.browser.url, self.edit_personal_student_path)