Changeset 11570


Ignore:
Timestamp:
3 Apr 2014, 12:53:11 (11 years ago)
Author:
Henrik Bettermann
Message:

We do no longer need the success return value.

Location:
main/waeup.kofa/trunk/src/waeup/kofa
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r11482 r11570  
    683683
    684684    def update(self):
    685         success, msg, log = self.context.approveApplicantPayment()
     685        msg, log = self.context.approveApplicantPayment()
    686686        if log is not None:
    687687            applicant = self.context.__parent__

  • main/waeup.kofa/trunk/src/waeup/kofa/applicants/payment.py

    r10914 r11570  
    4949        except InvalidTransitionError:
    5050            msg = log = 'Error: %s' % sys.exc_info()[1]
    51             return False, msg, log
     51            return msg, log
    5252        log = 'payment approved: %s' % self.p_id
    5353        msg = _('Payment approved')
    54         return False, msg, log
     54        return msg, log
    5555
    5656    def doAfterApplicantPayment(self):
    … …  
    6262        except InvalidTransitionError:
    6363            msg = log = 'Error: %s' % sys.exc_info()[1]
    64             return False, msg, log
     64            return msg, log
    6565        log = 'successful payment: %s' % self.p_id
    6666        msg = _('Successful payment')
    67         return False, msg, log
     67        return msg, log
    6868
    6969    def approveApplicantPayment(self):
    … …  
    7171        """
    7272        if self.p_state == 'paid':
    73             return False, _('This ticket has already been paid.'), None
     73            return _('This ticket has already been paid.'), None
    7474        self.approve()
    7575        return self.doAfterApplicantPaymentApproval()

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

    r11567 r11570  
    18561856
    18571857    def update(self):
    1858         success, msg, log = self.context.approveStudentPayment()
     1858        msg, log = self.context.approveStudentPayment()
    18591859        if log is not None:
    18601860            # Add log message to students.log

  • main/waeup.kofa/trunk/src/waeup/kofa/students/payments.py

    r10906 r11570  
    107107            error = self._createActivationCodes()
    108108            if error is not None:
    109                 return False, error, error
     109                return error, error
    110110        log = 'successful %s payment: %s' % (self.p_category, self.p_id)
    111111        msg = _('Successful payment')
    112         return True, msg, log
     112        return msg, log
    113113
    114114    def doAfterStudentPaymentApproval(self):
    … …  
    118118            error = self._createActivationCodes()
    119119            if error is not None:
    120                 return False, error, error
     120                return error, error
    121121        log = '%s payment approved: %s' % (self.p_category, self.p_id)
    122122        msg = _('Payment approved')
    123         return True, msg, log
     123        return msg, log
    124124
    125125    def approveStudentPayment(self):
    … …  
    127127        """
    128128        if self.p_state == 'paid':
    129             return False, _('This ticket has already been paid.'), None
     129            return _('This ticket has already been paid.'), None
    130130        self.approve()
    131131        return self.doAfterStudentPaymentApproval()
Note: See TracChangeset for help on using the changeset viewer.