Changeset 7997

Timestamp:

28 Mar 2012, 16:49:18 (12 years ago)

Author:

Henrik Bettermann

Message:

Callback requests in the base package are only for demonstration purposes. These components must be neutralized in the customization package.

Location:

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

Files:

• applicants/browser.py (modified) (1 diff)
• applicants/tests/test_browser.py (modified) (1 diff)
• applicants/viewlets.py (modified) (1 diff)
• students/browser.py (modified) (1 diff)
• students/tests/test_browser.py (modified) (6 diffs)
• students/viewlets.py (modified) (1 diff)

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

@@ -505 +505 @@
     """
     grok.context(IApplicantOnlinePayment)
-    grok.name('callback')
+    grok.name('simulate_callback')
     grok.require('waeup.payApplicant')
 
     # This update method simulates a valid callback und must be
-    # specified in the customization package. The parameters must be taken
-    # from the incoming request.
+    # neutralized in the customization package.
     def update(self):
         self.wf_info = IWorkflowInfo(self.context.__parent__)

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

@@ -644 +644 @@
                           self.browser.contents)
         # Callback can't be applied twice
-        self.browser.open(payment_url + '/callback')
+        self.browser.open(payment_url + '/simulate_callback')
         self.assertMatches(
             "...Transition 'pay' requires 'started' as source state...",

main/waeup.kofa/trunk/src/waeup/kofa/applicants/viewlets.py

@@ -182 +182 @@
     icon = 'actionicon_call.png'
     text = _('Request callback')
-    target = 'callback'
+    target = 'simulate_callback'
 
+    # This button must be neutralized
+    # in the customization package.
     @property
     def target_url(self):

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

@@ -1086 +1086 @@
     """
     grok.context(IStudentOnlinePayment)
-    grok.name('callback')
+    grok.name('simulate_callback')
     grok.require('waeup.payStudent')
 
     # This update method simulates a valid callback und must be
-    # specified in the customization package. The parameters must be taken
-    # from the incoming request.
+    # neutralized in the customization package.
     def update(self):
         if self.context.p_state == 'paid':

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

@@ -1256 +1256 @@
 
         # Callback can't be applied twice
-        self.browser.open(payment_url + '/callback')
+        self.browser.open(payment_url + '/simulate_callback')
         self.assertMatches('...This ticket has already been paid...',
                           self.browser.contents)
@@ -1298 +1298 @@
         value = ctrl.options[1] # The clearance payment is the second in the table
         self.browser.getLink(value).click()
-        self.browser.open(self.browser.url + '/callback')
+        self.browser.open(self.browser.url + '/simulate_callback')
         self.assertMatches('...Valid callback received...',
                           self.browser.contents)
@@ -1333 +1333 @@
         self.browser.getLink(value).click()
         payment_url = self.browser.url
-        self.browser.open(payment_url + '/callback')
+        self.browser.open(payment_url + '/simulate_callback')
         self.assertMatches('...Valid callback received...',
                           self.browser.contents)
@@ -1390 +1390 @@
         # Students can open the callback view which simulates a valid callback
         self.assertEqual(len(self.app['accesscodes']['SFE-0']),0)
-        self.browser.open(self.browser.url + '/callback')
+        self.browser.open(self.browser.url + '/simulate_callback')
         self.assertMatches('...Valid callback received...',
                           self.browser.contents)
@@ -1444 +1444 @@
         value = ctrl.options[0]
         self.browser.getLink(value).click()
-        self.browser.open(self.browser.url + '/callback')
+        self.browser.open(self.browser.url + '/simulate_callback')
         # The new HOS-0 pin has been created
         self.assertEqual(len(self.app['accesscodes']['HOS-0']),1)
@@ -1573 +1573 @@
         value = ctrl.options[0]
         self.browser.getLink(value).click()
-        self.browser.open(self.browser.url + '/callback')
+        self.browser.open(self.browser.url + '/simulate_callback')
         # The new HOS-0 pin has been created
         self.assertEqual(len(self.app['accesscodes']['HOS-0']),1)

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

@@ -314 +314 @@
     icon = 'actionicon_call.png'
     text = _('Request callback')
-    target = 'callback'
-
+    target = 'simulate_callback'
+
+    # This button must be neutralized
+    # in the customization package.
     @property
     def target_url(self):