Changeset 9021 for main

Timestamp:

18 Jul 2012, 20:24:55 (12 years ago)

Author:

Henrik Bettermann

Message:

We bypass the request_clearance page if student
has been imported in state 'clearance started' and
no clr_code was entered before.

Location:

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

Files:

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

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

@@ -1665 +1665 @@
             return
         self.flash(_('Clearance form has been saved.'))
-        self.redirect(self.url(self.context,'request_clearance'))
+        if self.context.clr_code:
+            self.redirect(self.url(self.context, 'request_clearance'))
+        else:
+            # We bypass the request_clearance page if student
+            # has been imported in state 'clearance started' and
+            # no clr_code was entered before.
+            state = IWorkflowState(self.context).getState()
+            if state != CLEARANCE:
+                # This shouldn't happen, but the application officer
+                # might have forgotten to lock the form after changing the state
+                self.flash(_('This form cannot be submitted. Wrong state!'))
+                return
+            IWorkflowInfo(self.context).fireTransition('request_clearance')
+            self.flash(_('Clearance has been requested.'))
+            self.redirect(self.url(self.context))
         return
 
@@ -1685 +1699 @@
             return
         pin = '%s-%s-%s' % (self.ac_prefix, self.ac_series, self.ac_number)
-        if self.context.clr_code != pin:
+        if self.context.clr_code and self.context.clr_code != pin:
             self.flash(_("This isn't your CLR access code."))
             return
         state = IWorkflowState(self.context).getState()
-        # This shouldn't happen, but the application officer
-        # might have forgotten to lock the form after changing the state
         if state != CLEARANCE:
+            # This shouldn't happen, but the application officer
+            # might have forgotten to lock the form after changing the state
             self.flash(_('This form cannot be submitted. Wrong state!'))
             return

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

@@ -922 +922 @@
         self.assertTrue('clearance started' in self.browser.contents)
         self.browser.open(self.history_path)
-        self.assertTrue("Reset to 'clearance' by My Public Name" in
+        self.assertTrue("Reset to 'clearance started' by My Public Name" in
             self.browser.contents)
         IWorkflowInfo(self.student).fireTransition('request_clearance')
@@ -1304 +1304 @@
         self.assertEqual(self.student.state, 'courses registered')
         return
+
+    def test_student_clearance_wo_clrcode(self):
+        IWorkflowState(self.student).setState('clearance started')
+        self.browser.open(self.login_path)
+        self.browser.getControl(name="form.login").value = self.student_id
+        self.browser.getControl(name="form.password").value = 'spwd'
+        self.browser.getControl("Login").click()
+        self.student.clearance_locked = False
+        self.browser.open(self.edit_clearance_path)
+        self.browser.getControl(name="form.date_of_birth").value = '09/10/1961'
+        self.browser.getControl("Save and request clearance").click()
+        self.assertMatches('...Clearance has been requested...',
+                           self.browser.contents)
 
     def test_manage_payments(self):