Changeset 14822 for main/waeup.aaue/trunk

Timestamp:

30 Aug 2017, 10:33:33 (7 years ago)

Author:

Henrik Bettermann

Message:

Show screening invitation link only after applicants have paid.

Location:

main/waeup.aaue/trunk/src/waeup/aaue/applicants

Files:

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

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

@@ -391 +391 @@
     @property
     def display_actions(self):
-        state = IWorkflowState(self.context).getState()
         # If the form is unlocked, applicants are allowed to save the form
         # and remove unused tickets.
         actions = [[_('Save')], []]
         # Only in state started they can also add tickets.
-        if state == STARTED:
+        if self.context.state == STARTED:
             actions = [[_('Save')],
                 [_('Add online payment ticket')]]
         # In state paid, they can submit the data and further add tickets
         # if the application is special.
-        elif self.context.special and state == PAID:
+        elif self.context.special and self.context.state == PAID:
             actions = [[_('Save'), _('Finally Submit')],
                 [_('Add online payment ticket')]]
-        elif state == PAID:
+        elif self.context.state == PAID:
             actions = [[_('Save'), _('Finally Submit')], []]
         return actions
@@ -494 +493 @@
     grok.template('applicantcheckstatus')
 
-class PaymentReceiptActionButton(ManageActionButton):
+class ScreeningInvitationActionButton(ManageActionButton):
     grok.order(8) # This button should always be the last one.
     grok.context(ICustomApplicant)
@@ -505 +504 @@
     @property
     def target_url(self):
-        if not self.context.screening_date:
+        if not self.context.screening_date or not self.context.state in (
+            'submitted', 'admitted', 'paid', 'created'):
             return ''
         return self.view.url(self.view.context, self.target)
@@ -563 +563 @@
 
     def update(self):
-        if not self.context.screening_date:
+        if not self.context.screening_date or not self.context.state in (
+            'submitted', 'admitted', 'paid', 'created'):
             self.flash(_('Forbidden'), type="warning")
             self.redirect(self.url(self.context))

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

@@ -86 +86 @@
         self.applicant.firstname = u'Jo'
         self.applicant.email = 'xx@yy.zz'
+        self.browser.open(self.view_path)
+        self.assertFalse("Download application slip" in self.browser.contents)
+        IWorkflowState(self.applicant).setState('paid')
         self.browser.open(self.view_path)
         self.browser.getLink("screening invitation").click()