Changeset 9526 for main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/students/utils.py

Timestamp:

4 Nov 2012, 19:59:50 (12 years ago)

Author:

Henrik Bettermann

Message:

Adjust to changes made in base package.

File:

• main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/students/utils.py (modified) (2 diffs)

main/waeup.kwarapoly/trunk/src/waeup/kwarapoly/students/utils.py

@@ -126 +126 @@
         p_level = student['studycourse'].current_level
         p_current = True
-        session = str(p_session)
-        try:
-            academic_session = grok.getSite()['configuration'][session]
-        except KeyError:
+        academic_session = self._getSessionConfiguration(p_session)
+        if academic_session == None:
             return _(u'Session configuration object is not available.'), None
+        # Determine fee.
         if category == 'transfer':
             amount = academic_session.transfer_fee
@@ -152 +151 @@
                 return _('Study course data are incomplete.'), None
             if student.state == RETURNING:
+                # Override p_session and p_level
                 p_session, p_level = self.getReturningData(student)
+                academic_session = self._getSessionConfiguration(p_session)
+                if academic_session == None:
+                    return _(u'Session configuration object is not available.'), None
             if student.state in (RETURNING, CLEARED):
                 if p_level in PAYMENT_LEVELS: