Changeset 1299

Timestamp:

15 Jan 2007, 11:05:26 (18 years ago)

Author:

Henrik Bettermann

Message:

accommodation_view and slip only allowed if acco object exists

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• accommodation_view.pt (modified) (1 diff)
• getAccommodationInfo.py (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_student/accommodation_view.pt

@@ -5 +5 @@
         <metal:block use-macro="here/error_not_found/macros/not_found" />
       </span>
-      <span tal:condition="info"
-            tal:define="review_state info/review_state">
-            
+      <span tal:condition="info">
         <div style="text-align: right">
         <a href="" target="slip" tal:attributes="href string:accommodation_slip"

WAeUP_SRP/trunk/skins/waeup_student/getAccommodationInfo.py

@@ -39 +39 @@
     logger.info('"%s","not found in students_catalog"')
     return None
-
+    
 ekehuan_certificates = ('BARTAPG',
                         'BARTAPM',
@@ -84 +84 @@
 acco_id = 'accommodation_2006'
 acco = getattr(student,acco_id,None)
+
+if acco == None:
+    logger.info('"%s","tried to access non-existing acco object"')
+    return None
+
 info['acco'] = acco
 info['acco_id'] = acco_id