Changeset 652 for WAeUP_SRP/trunk/skins

Timestamp:

11 Oct 2006, 07:50:28 (18 years ago)

Author:

joachim

Message:

cleanup naming in accommodation part II

Location:

WAeUP_SRP/trunk/skins/waeup_student

Files:

• accommodation_pin_form.pt (moved) (moved from WAeUP_SRP/trunk/skins/waeup_accommodation/reserve_acco_form.pt)
• accommodation_slip.pt (moved) (moved from WAeUP_SRP/trunk/skins/waeup_accommodation/hostal_reservation_slip.pt)
• reserve_accommodation.py (moved) (moved from WAeUP_SRP/trunk/skins/waeup_accommodation/reserve_acco.py) (4 diffs)

WAeUP_SRP/trunk/skins/waeup_student/reserve_accommodation.py

@@ -20 +20 @@
 if info['acco']:
     return context.REQUEST.RESPONSE.redirect("%s" % info['acco'].absolute_url())
-res,psm,ds = lt.renderLayout(layout_id= 'student_acco_reserve',
-                      schema_id= 'student_acco_reserve',
+res,psm,ds = lt.renderLayout(layout_id= 'student_accommodation_fe',
+                      schema_id= 'student_accommodation_fe',
                       context=context,
                       mapping=validate and REQUEST,
                       ob={},
                       layout_mode='create',
-                      formaction = "reserve_acco",
+                      formaction = "reserve_accommodation",
                       button = "book Bed",
                       )
 if psm == 'invalid':
-    return context.reserve_acco_form(rendered = res,
+    return context.accommodation_pin_form(rendered = res,
                                  #psm = "Please correct your input.",
                                  psm = "%s, %s" % (psm,ds),
@@ -38 +38 @@
                                  )
 elif psm == '':
-    return context.reserve_acco_form(rendered = res,
+    return context.accommodation_pin_form(rendered = res,
                                  psm = None,
                                  firstlayout = True,
@@ -51 +51 @@
     code,bed = pa.searchAndReserveBed(s_id,"%s_%s" % (info['sex'],ds.get('student_status')))
     if code < 0:
-        return context.reserve_acco_form(rendered = res,
+        return context.accommodation_pin_form(rendered = res,
                                  psm = bed,
                                  firstlayout = True,
@@ -63 +63 @@
 ds.set('session', session)
 acco.getContent().edit(mapping=ds)
-return context.REQUEST.RESPONSE.redirect("%s/hostal_reservation_slip" % student.absolute_url())
-##return context.reserve_acco_form(rendered = res,
+return context.REQUEST.RESPONSE.redirect("%s/accommodation_slip" % student.absolute_url())
+##return context.accommodation_pin_form(rendered = res,
 ##                                 psm = "successfully reserved bed %s" % bed,
 ##                                 firstlayout = True,