Changeset 4008 for WAeUP_SRP/trunk

Timestamp:

10 Mar 2009, 07:33:20 (16 years ago)

Author:

Henrik Bettermann

Message:

distinguish between booking_allowed and booking_disabled (tested for uniben and futminna)

fix getMemberInfo.py

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_aaua/getAccommodationInfo.py (modified) (1 diff)
• waeup_accommodation/booking_disabled.pt (modified) (1 diff)
• waeup_accommodation/getAccommodationInfo.py (modified) (1 diff)
• waeup_fceoyo/getAccommodationInfo.py (modified) (1 diff)
• waeup_futminna/getAccommodationInfo.py (modified) (1 diff)
• waeup_student/getMemberInfo.py (modified) (1 diff)
• waeup_unilorin/getAccommodationInfo.py (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_aaua/getAccommodationInfo.py

@@ -118 +118 @@
     info['maintenance_paid'] = info['acco_review_state'] == "maintenance_fee_paid"
 elif booking_disabled:
-    info['booking_allowed'] = False
     info['booking_disabled'] = True
     logger.info('%s: %s eligible but booking disabled' % (student_id,student_status))  

WAeUP_SRP/trunk/skins/waeup_accommodation/booking_disabled.pt

@@ -2 +2 @@
   <metal:main fill-slot="main">
 
-    <h3>Accommodation booking is disabled.</h3>
+    <h3>Accommodation booking is temporarily disabled.</h3>
 
   </metal:main>

WAeUP_SRP/trunk/skins/waeup_accommodation/getAccommodationInfo.py

@@ -161 +161 @@
     info['maintenance_paid'] = info['acco_review_state'] == "maintenance_fee_paid"
 elif booking_disabled:
-    info['booking_allowed'] = False
     info['booking_disabled'] = True
     logger.info('%s: %s eligible but booking disabled' % (student_id,student_status))  

WAeUP_SRP/trunk/skins/waeup_fceoyo/getAccommodationInfo.py

@@ -119 +119 @@
     info['maintenance_paid'] = info['acco_review_state'] == "maintenance_fee_paid"
 elif booking_disabled:
-    info['booking_allowed'] = False
     info['booking_disabled'] = True
     logger.info('%s: %s eligible but booking disabled' % (student_id,student_status))  

WAeUP_SRP/trunk/skins/waeup_futminna/getAccommodationInfo.py

@@ -103 +103 @@
     info['maintenance_paid'] = info['acco_review_state'] == "maintenance_fee_paid"
 elif booking_disabled:
-    info['booking_allowed'] = False
     info['booking_disabled'] = True
     logger.info('%s: %s eligible but booking disabled' % (student_id,student_status)) 

WAeUP_SRP/trunk/skins/waeup_student/getMemberInfo.py

@@ -37 +37 @@
 student_id = info['student_id']
 if student_id is None:
-    return 'You are not allowed to access this information!'
+    return None
 
 students_object = context.portal_url.getPortalObject().campus.students

WAeUP_SRP/trunk/skins/waeup_unilorin/getAccommodationInfo.py

@@ -113 +113 @@
     info['maintenance_paid'] = info['acco_review_state'] == "maintenance_fee_paid"
 elif booking_disabled:
-    info['booking_allowed'] = False
     info['booking_disabled'] = True
     logger.info('%s: %s eligible but booking disabled' % (student_id,student_status))