Changeset 849 for WAeUP_SRP/trunk/skins

Timestamp:

12 Nov 2006, 07:27:27 (18 years ago)

Author:

Henrik Bettermann

Message:

accommodation_pin_form renamed
student action 'Book Hostel' moved to student_navigation 'My Accommodation'
StudentAccommodation? object always invisible for student in in student_view

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• accommodation_pin_edit_form.pt (added)
• accommodation_pin_form.pt (deleted)
• getStudentInfo.py (modified) (1 diff)
• reserve_accommodation.py (modified) (3 diffs)

WAeUP_SRP/trunk/skins/waeup_student/getStudentInfo.py

@@ -124 +124 @@
         row['s_edit_link'] = "%s/%s" % (soo.absolute_url(),se_link)
     row['review_state'] = so.review_state
-    row['display'] = so.review_state in ('opened','closed','public','bed_reserved',) #or\
-                     #so.portal_type in ("StudentAccommodation","StudentStudyCourse")
+    row['display'] = so.review_state in ('opened','closed',)
     items.append(row)
 info['items'] = items

WAeUP_SRP/trunk/skins/waeup_student/reserve_accommodation.py

@@ -47 +47 @@
                       )
 if psm == 'invalid':
-    return context.accommodation_pin_form(rendered = res,
+    return context.accommodation_pin_edit_form(rendered = res,
                                  psm = "Please correct your input.",
                                  #psm = "%s, %s" % (psm,ds),
@@ -54 +54 @@
                                  )
 elif psm == '':
-    return context.accommodation_pin_form(rendered = res,
+    return context.accommodation_pin_edit_form(rendered = res,
                                  psm = None,
                                  mode = mode,
@@ -66 +66 @@
         code,bed = pa.searchAndReserveBed(s_id,"%s_%s" % (info['sex'],ds.get('student_status')))
         if code < 0:
-            return context.accommodation_pin_form(rendered = res,
+            return context.accommodation_pin__edit_form(rendered = res,
                                  psm = bed,
                                  mode = mode,