Changeset 652


Ignore:
Timestamp:
11 Oct 2006, 07:50:28 (18 years ago)
Author:
joachim
Message:

cleanup naming in accommodation part II

Location:
WAeUP_SRP/trunk
Files:
5 edited
5 moved

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/trunk/profiles/default/actionicons.xml

    r631 r652  
    238238              title="Apply for PUME" priority="2"
    239239              icon_expr="bell.png"/>
    240  <action-icon category="student" action_id="reserve_acco"
     240 <action-icon category="student" action_id="reserve_accommodation"
    241241              title="Book Hostal" priority="3"
    242242              icon_expr="bell.png"/>                         

  • WAeUP_SRP/trunk/profiles/default/actions.xml

    r640 r652  
    138138   <permission>View</permission>
    139139  </action>
    140   <action title="Book Hostal" action_id="reserve_acco"
     140  <action title="Book Hostal" action_id="reserve_accommodation"
    141141     category="student" condition_expr="member"
    142      url_expr="string:${portal_url}/reserve_acco"
     142     url_expr="string:${portal_url}/reserve_accommodation"
    143143     visible="True">
    144144   <permission>View</permission>

  • WAeUP_SRP/trunk/profiles/default/layouts.xml

    r629 r652  
    1414 <object name="student_study_course" meta_type="CPS Layout"/>
    1515 <object name="student_accommodation" meta_type="CPS Layout"/>
    16  <object name="student_acco_reserve" meta_type="CPS Layout"/>
     16 <object name="student_accommodation_fe" meta_type="CPS Layout"/>
    1717 <object name="student_application" meta_type="CPS Layout"/>
    1818 <object name="student_application_fe" meta_type="CPS Layout"/>

  • WAeUP_SRP/trunk/profiles/default/schemas.xml

    r629 r652  
    1717 <object name="scratch_card_batch" meta_type="CPS Schema"/>
    1818 <object name="student_accommodation" meta_type="CPS Schema"/>
    19  <object name="student_acco_reserve" meta_type="CPS Schema"/>
     19 <object name="student_accommodation_fe" meta_type="CPS Schema"/>
    2020 <object name="student_application" meta_type="CPS Schema"/>
    2121 <object name="student_clearance" meta_type="CPS Schema"/>

  • WAeUP_SRP/trunk/profiles/default/types/StudentAccommodation.xml

    r642 r652  
    88 <property name="product">WAeUP_SRP</property>
    99 <property name="factory">addStudentAccommodation</property>
    10  <property name="immediate_view">hostal_reservation_slip</property>
     10 <property name="immediate_view">accommodation_slip</property>
    1111 <property name="global_allow">True</property>
    1212 <property name="filter_content_types">True</property>
    … …  
    2626 <property name="storage_methods"/>
    2727 <property name="cps_is_portlet">False</property>
    28  <alias from="(Default)" to="hostal_reservation_slip"/>
    29  <alias from="view" to="hostal_reservation_slip"/>
     28 <alias from="(Default)" to="accommodation_slip"/>
     29 <alias from="view" to="accommodation_slip"/>
    3030 <action title="Standard View" action_id="view" category="object"
    31     condition_expr="" url_expr="string:${object_url}/hostal_reservation_slip"
     31    condition_expr="" url_expr="string:${object_url}/accommodation_slip"
    3232    visible="True">
    3333  <permission value="View"/>

  • WAeUP_SRP/trunk/skins/waeup_student/reserve_accommodation.py

    r642 r652  
    2020if info['acco']:
    2121    return context.REQUEST.RESPONSE.redirect("%s" % info['acco'].absolute_url())
    22 res,psm,ds = lt.renderLayout(layout_id= 'student_acco_reserve',
    23                       schema_id= 'student_acco_reserve',
     22res,psm,ds = lt.renderLayout(layout_id= 'student_accommodation_fe',
     23                      schema_id= 'student_accommodation_fe',
    2424                      context=context,
    2525                      mapping=validate and REQUEST,
    2626                      ob={},
    2727                      layout_mode='create',
    28                       formaction = "reserve_acco",
     28                      formaction = "reserve_accommodation",
    2929                      button = "book Bed",
    3030                      )
    3131if psm == 'invalid':
    32     return context.reserve_acco_form(rendered = res,
     32    return context.accommodation_pin_form(rendered = res,
    3333                                 #psm = "Please correct your input.",
    3434                                 psm = "%s, %s" % (psm,ds),
    … …  
    3838                                 )
    3939elif psm == '':
    40     return context.reserve_acco_form(rendered = res,
     40    return context.accommodation_pin_form(rendered = res,
    4141                                 psm = None,
    4242                                 firstlayout = True,
    … …  
    5151    code,bed = pa.searchAndReserveBed(s_id,"%s_%s" % (info['sex'],ds.get('student_status')))
    5252    if code < 0:
    53         return context.reserve_acco_form(rendered = res,
     53        return context.accommodation_pin_form(rendered = res,
    5454                                 psm = bed,
    5555                                 firstlayout = True,
    … …  
    6363ds.set('session', session)
    6464acco.getContent().edit(mapping=ds)
    65 return context.REQUEST.RESPONSE.redirect("%s/hostal_reservation_slip" % student.absolute_url())
    66 ##return context.reserve_acco_form(rendered = res,
     65return context.REQUEST.RESPONSE.redirect("%s/accommodation_slip" % student.absolute_url())
     66##return context.accommodation_pin_form(rendered = res,
    6767##                                 psm = "successfully reserved bed %s" % bed,
    6868##                                 firstlayout = True,
Note: See TracChangeset for help on using the changeset viewer.