Changeset 16266

Timestamp:

5 Oct 2020, 09:23:41 (4 years ago)

Author:

Henrik Bettermann

Message:

Redirect to payment ticket page after ticket creation.

Remove 'Comment by Import Manager:' in emails.

Location:

main/waeup.kofa/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• src/waeup/kofa/browser/pages.py (modified) (1 diff)
• src/waeup/kofa/students/browser.py (modified) (3 diffs)
• src/waeup/kofa/students/tests/test_browser.py (modified) (17 diffs)

main/waeup.kofa/trunk/CHANGES.txt

@@ -4 +4 @@
 1.6.1.dev0 (unreleased)
 =======================
+
+* Redirect to payment ticket page after ticket creation.
 
 * Use Uli's marker substitution hack to inject signature

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

@@ -1445 +1445 @@
 ${e}
 
-Comment by Import Manager:""", mapping = {'a':normalized_filename,
+""", mapping = {'a':normalized_filename,
                 'b':importer,
                 'c':import_mode,

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

@@ -2217 +2217 @@
         self.flash(_('Payment ticket created.'))
         self.context.writeLogMessage(self,'added: %s' % payment.p_id)
-        self.redirect(self.url(self.context))
+        self.redirect(self.url(payment))
         return
 
@@ -2256 +2256 @@
         self.flash(_('Payment ticket created.'))
         self.context.writeLogMessage(self,'added: %s' % payment.p_id)
-        self.redirect(self.url(self.context))
+        self.redirect(self.url(payment))
         return
 
@@ -2291 +2291 @@
         self.flash(_('Payment ticket created.'))
         self.context.writeLogMessage(self,'added: %s' % payment.p_id)
-        self.redirect(self.url(self.context))
+        self.redirect(self.url(payment))
         return
 

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

@@ -1018 +1018 @@
         self.assertMatches('...ticket created...',
                            self.browser.contents)
+        self.browser.open(self.payments_path)
         ctrl = self.browser.getControl(name='val_id')
         value = ctrl.options[0]
@@ -1127 +1128 @@
         # Managers can approve the payment
         self.assertEqual(len(self.app['accesscodes']['CLR-0']),0)
-        ctrl = self.browser.getControl(name='val_id')
-        value = ctrl.options[1] # The clearance payment is the second in the table
-        self.browser.getLink(value).click()
         self.browser.open(self.browser.url + '/approve')
         self.assertMatches('...Payment approved...',
@@ -1154 +1152 @@
         # Managers can approve the payment
         self.assertEqual(len(self.app['accesscodes']['TSC-0']),0)
-        ctrl = self.browser.getControl(name='val_id')
-        value = ctrl.options[2] # The clearance payment is the third in the table
-        self.browser.getLink(value).click()
         self.browser.open(self.browser.url + '/approve')
         self.assertMatches('...Payment approved...',
@@ -1182 +1177 @@
         self.assertMatches('...ticket created...',
                            self.browser.contents)
+        self.browser.open(self.payments_path)
         ctrl = self.browser.getControl(name='val_id')
         value = ctrl.options[0]
@@ -1196 +1192 @@
         self.browser.getControl(name="form.p_category").value = ['schoolfee']
         self.browser.getControl("Create ticket").click()
+        self.browser.open(self.payments_path)
         ctrl = self.browser.getControl(name='val_id')
         value = ctrl.options[0]
@@ -1241 +1238 @@
                            self.browser.contents)
         self.app['configuration']['2004'].payment_disabled = ['sf_all']
+        self.browser.open(self.payments_path)
         self.browser.getLink("Add current session payment ticket").click()
         self.browser.getControl(name="form.p_category").value = ['schoolfee']
@@ -1281 +1279 @@
         self.assertMatches('...ticket created...',
                            self.browser.contents)
+        self.browser.open(self.payments_path)
         ctrl = self.browser.getControl(name='val_id')
         value = ctrl.options[0]
@@ -1316 +1315 @@
         self.browser.getControl(name="form.p_category").value = ['bed_allocation']
         self.browser.getControl("Create ticket").click()
-        ctrl = self.browser.getControl(name='val_id')
-        value = ctrl.options[0]
-        self.browser.getLink(value).click()
         self.browser.open(self.browser.url + '/approve')
         # The new HOS-0 pin has been created
@@ -3203 +3199 @@
         # Students can't approve the payment
         self.assertEqual(len(self.app['accesscodes']['CLR-0']),0)
+        self.browser.open(self.payments_path)
         ctrl = self.browser.getControl(name='val_id')
         value = ctrl.options[0]
@@ -3288 +3285 @@
         self.assertMatches('...ticket created...',
                            self.browser.contents)
+        self.browser.open(self.payments_path)
         ctrl = self.browser.getControl(name='val_id')
         value = ctrl.options[0]
@@ -3414 +3412 @@
         self.assertMatches('...ticket created...',
                            self.browser.contents)
+        self.browser.open(self.payments_path)
         ctrl = self.browser.getControl(name='val_id')
         value = ctrl.options[0]
@@ -3479 +3478 @@
         self.assertMatches('...ticket created...',
                            self.browser.contents)
+        self.browser.open(self.payments_path)
         ctrl = self.browser.getControl(name='val_id')
         value = ctrl.options[0]
@@ -3518 +3518 @@
         self.browser.getControl(name="form.p_category").value = ['schoolfee']
         self.browser.getControl("Create ticket").click()
+        self.browser.open(self.payments_path)
         ctrl = self.browser.getControl(name='val_id')
         value = ctrl.options[0]
@@ -3575 +3576 @@
         self.browser.getControl(name="form.p_category").value = ['bed_allocation']
         self.browser.getControl("Create ticket").click()
+        self.browser.open(self.payments_path)
         ctrl = self.browser.getControl(name='val_id')
         value = ctrl.options[0]
@@ -3692 +3694 @@
         self.assertMatches('...Payment ticket created...',
                            self.browser.contents)
+        self.browser.open(self.payments_path)
         ctrl = self.browser.getControl(name='val_id')
         value = ctrl.options[0]
@@ -3702 +3705 @@
         self.browser.getControl(name="form.p_category").value = ['hostel_maintenance']
         self.browser.getControl("Create ticket").click()
+        self.browser.open(self.payments_path)
         ctrl = self.browser.getControl(name='val_id')
         value = ctrl.options[1]
@@ -3760 +3764 @@
         self.browser.getControl(name="form.p_category").value = ['transcript']
         self.browser.getControl("Create ticket").click()
+        self.browser.open(self.payments_path)
         ctrl = self.browser.getControl(name='val_id')
         value = ctrl.options[0]