Changeset 13580


Ignore:
Timestamp:
10 Jan 2016, 17:36:12 (9 years ago)
Author:
Henrik Bettermann
Message:

Revert changes from revisions 13577 and 13578. This doesn't work.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • main/kofacustom.nigeria/trunk/src/kofacustom/nigeria/interswitch/browser.py

    r13579 r13580  
    6464    @property
    6565    def target_url(self):
    66         if self.context.p_state == 'waived':
    67             return ''
    68         if self.context.p_state == 'paid' \
    69             and not checkPermission('waeup.manageStudent', self.context):
     66        if self.context.p_state in ('paid', 'waived'):
    7067            return ''
    7168        return self.view.url(self.view.context, self.target)
    … …  
    7572    grok.view(OPDPApplicant)
    7673    grok.require('waeup.payApplicant')
    77 
    78     @property
    79     def target_url(self):
    80         if self.context.p_state == 'paid' \
    81             and not checkPermission('waeup.manageApplication', self.context):
    82             return ''
    83         return self.view.url(self.view.context, self.target)
    8474
    8575class InterswitchPaymentRequestWebservicePageStudent(UtilityView, grok.View):
    … …  
    9787
    9888    def update(self):
    99         if self.context.p_state == 'waived':
    100             self.flash(_('This ticket cannot be requeried.'), type='warning')
    101             return
    102         if self.context.p_state == 'paid' \
    103             and not checkPermission('waeup.manageStudent', self.context):
     89        if self.context.p_state in ('paid', 'waived'):
    10490            self.flash(_('This ticket has already been paid.'), type='danger')
    10591            return
    … …  
    138124
    139125    def update(self):
    140         if self.context.p_state == 'paid' \
    141             and not checkPermission('waeup.manageApplication', self.context):
     126        if self.context.p_state == 'paid':
    142127            self.flash(_('This ticket has already been paid.'), type='danger')
    143128            return
Note: See TracChangeset for help on using the changeset viewer.