Changeset 649 for WAeUP_SRP


Ignore:
Timestamp:
11 Oct 2006, 06:24:39 (18 years ago)
Author:
joachim
Message:

cleanup naming in accommodation part I

Location:
WAeUP_SRP/trunk
Files:
4 edited
4 moved

Legend:

Unmodified
Added
Removed

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

    r626 r649  
    88 <property name="product">WAeUP_SRP</property>
    99 <property name="factory">addAccoFolder</property>
    10  <property name="immediate_view">accommodation_index</property>
     10 <property name="immediate_view">acco_folder_index</property>
    1111 <property name="global_allow">True</property>
    1212 <property name="filter_content_types">True</property>
    … …  
    2929 <property name="storage_methods"/>
    3030 <property name="cps_is_portlet">False</property>
    31  <alias from="(Default)" to="accommodation_index"/>
    32  <alias from="view" to="accommodation_index"/>
     31 <alias from="(Default)" to="acco_folder_index"/>
     32 <alias from="view" to="acco_folder_index"/>
    3333 <action title="View" action_id="view" category="object" condition_expr=""
    34     url_expr="string:${object_url}/accommodation_index" visible="True">
     34    url_expr="string:${object_url}/acco_folder_index" visible="True">
    3535  <permission value="View"/>
    3636 </action>

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

    r635 r649  
    88 <property name="product">WAeUP_SRP</property>
    99 <property name="factory">addAccoHall</property>
    10  <property name="immediate_view">accommodation_index</property>
     10 <property name="immediate_view">acco_folder_index</property>
    1111 <property name="global_allow">True</property>
    1212 <property name="filter_content_types">True</property>
    … …  
    3030 <property name="storage_methods"/>
    3131 <property name="cps_is_portlet">False</property>
    32  <alias from="(Default)" to="accommodation_index"/>
    33  <alias from="view" to="accommodation_index"/>
     32 <alias from="(Default)" to="acco_folder_index"/>
     33 <alias from="view" to="acco_folder_index"/>
    3434 <action title="View" action_id="view" category="object" condition_expr=""
    35     url_expr="string:${object_url}/accommodation_index" visible="True">
     35    url_expr="string:${object_url}/acco_folder_index" visible="True">
    3636  <permission value="View"/>
    3737 </action>

  • WAeUP_SRP/trunk/skins/waeup_accommodation/acco_folder_index.py

    r637 r649  
    2424if context.isManager():
    2525    if context.portal_type == 'AccoFolder':
    26         return context.accommodation.accommodation_view()
     26        return context.accommodation.acco_folder_view()
    2727    elif context.portal_type == 'AccoHall':
    2828        return context.acco_hall_view()

  • WAeUP_SRP/trunk/skins/waeup_accommodation/acco_folder_view.pt

    r637 r649  
    1 <metal:html tal:define="info context/getAccoHallsInfo;
     1<metal:html tal:define="info context/getAccoFolderInfo;
    22            is_manager info/is_manager|nothing;
    33            beds_generated options/beds_generated|nothing"

  • WAeUP_SRP/trunk/skins/waeup_accommodation/acco_hall_view.pt

    r632 r649  
    1 <metal:html tal:define="info context/getHallInfo;
     1<metal:html tal:define="info context/getAccoHallInfo;
    22            is_manager info/is_manager|nothing;"
    33            >

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

    r543 r649  
    4949          % (context.absolute_url(),s_id,pin.split('-')[2],pin))
    5050
    51 ##    jamb_id = ds.get('jamb_reg_no')
    52 ##    student = context.getContent().getStudentByRegNo(jamb_id)
    53 ##    if student is None:
    54 ##        psm = "JAMB record %s not accessible." % (jamb_id)
    55 ##        return context.application_pin_form(rendered = res,
    56 ##                                 psm = psm,
    57 ##                                 #psm = "%s, %s" % (psm,ds),
    58 ##                                 ds = ds,
    59 ##                                 )
    60 ##if context.portal_workflow.getInfoFor(student,'review_state',None) == "created":
    61 ##    #student.invokeFactory('StudentClearance','clearance')
    62 ##da = {}
    63 ##pin = str(ds.get('app_ac_pin'))
    64 ##da['app_ac_pin'] = pin
    65 ##da['app_ac_date'] = current
    66 ##apdoc.edit(mapping = da)
    67 
    68 
    69 # now display the passport form with jamb-data readonly
    70 ##return context.REQUEST.RESPONSE.redirect("%s/application_form" % (student.application.absolute_url()))
    71 ##return student.application_form()
    72 
    7351return
    7452
Note: See TracChangeset for help on using the changeset viewer.