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

Timestamp:

3 Nov 2012, 09:25:46 (12 years ago)

Author:

Henrik Bettermann

Message:

Different error strings should lead to a redirection to the PreviousPaymentAddFormPage?.

Location:

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

Files:

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

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

@@ -1378 +1378 @@
         if error is not None:
             self.flash(error)
-            if 'previous session' in error:
+            if 'previous session' in error or 'Would you like' in error:
                 self.redirect(self.url(self.context) + '/@@addpp')
                 return

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

@@ -833 +833 @@
             '...This type of payment has already been made...',
             self.browser.contents)
+        # The PreviousPaymentAddFormPage opens
+        self.assertEqual(self.browser.url, self.payments_path + '/@@addpp')
 
         # Managers can open the pdf payment slip

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

@@ -381 +381 @@
                ticket.p_session == p_session:
                   return _('This type of payment has already been made.' +
-                           ' Would you like to pay for a previous session?'), None
+                           ' Would you like to pay for another session?'), None
         payment = createObject(u'waeup.StudentOnlinePayment')
         timestamp = ("%d" % int(time()*10000))[1:]