Changeset 8744

Timestamp:

18 Jun 2012, 06:58:55 (12 years ago)

Author:

Henrik Bettermann

Message:

Merged with waeup.uniben 8740:HEAD.

Location:

main/waeup.futminna/trunk/src/waeup/futminna

Files:

• . (modified) (1 prop)
• applicants/interfaces.py (modified) (1 diff)
• interswitch/browser.py (modified) (8 diffs)
• students/payments.py (modified) (1 diff)
• students/studycourse.py (modified) (1 diff)

main/waeup.futminna/trunk/src/waeup/futminna/applicants/interfaces.py

@@ -312 +312 @@
     """
 
-    def loggerInfo(ob_class, comment):
+    def writeLogMessage(view, comment):
         """Adds an INFO message to the log file
         """

main/waeup.futminna/trunk/src/waeup/futminna/interswitch/browser.py

@@ -26 +26 @@
 from waeup.kofa.interfaces import RETURNING, IKofaUtils
 from waeup.kofa.utils.helpers import to_timezone
-from waeup.kofa.students.browser import write_log_message
 from waeup.kofa.students.viewlets import ApprovePaymentActionButton as APABStudent
 from waeup.kofa.applicants.viewlets import ApprovePaymentActionButton as APABApplicant
@@ -208 +207 @@
             return
 
-        student = self.student = self.context.getStudent()
-        certificate = getattr(self.student['studycourse'],'certificate',None)
+        student = self.student = self.context.student
+        certificate = getattr(student['studycourse'],'certificate',None)
         self.amount_auth = 100 * self.context.amount_auth
         xmldict = {}
@@ -361 +360 @@
 #            self.flash(_('This ticket has already been paid.'))
 #            return
-#        student = self.context.getStudent()
+#        student = self.context.student
 #        query = self.request.form
 #        write_log_message(self,'callback received: %s' % query)
@@ -415 +414 @@
             self.flash(_('This ticket has already been paid.'))
             return
-        student = self.context.getStudent()
+        student = self.context.student
         success, msg, log = query_interswitch(self.context)
-        student.loggerInfo(ob_class, log)
+        student.writeLogMessage(self, log)
         if not success:
             self.flash(msg)
@@ -423 +422 @@
         success, msg, log = self.context.doAfterStudentPayment()
         if log is not None:
-            student.loggerInfo(ob_class, log)
+            student.writeLogMessage(self, log)
         self.flash(msg)
         return
@@ -439 +438 @@
 
     def update(self):
-        ob_class = self.__implemented__.__name__
         if self.context.p_state == 'paid':
             self.flash(_('This ticket has already been paid.'))
@@ -445 +443 @@
         applicant = self.context.__parent__
         success, msg, log = query_interswitch(self.context)
-        applicant.loggerInfo(ob_class, log)
+        applicant.writeLogMessage(self, log)
         if not success:
             self.flash(msg)
@@ -451 +449 @@
         success, msg, log = self.context.doAfterApplicantPayment()
         if log is not None:
-            applicant.loggerInfo(ob_class, log)
+            applicant.writeLogMessage(self, log)
         self.flash(msg)
         return

main/waeup.futminna/trunk/src/waeup/futminna/students/payments.py

@@ -43 +43 @@
         return
 
-    def getStudent(self):
+    @property
+    def student(self):
         return self.__parent__.__parent__
 

main/waeup.futminna/trunk/src/waeup/futminna/students/studycourse.py

@@ -38 +38 @@
     @property
     def next_session_allowed(self):
-        state = self.getStudent().state
+        state = self.student.state
         certificate = getattr(self, 'certificate', None)
         if certificate == None: