Changeset 649

Timestamp:

11 Oct 2006, 06:24:39 (18 years ago)

Author:

joachim

Message:

cleanup naming in accommodation part I

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/types/AccoFolder.xml (modified) (2 diffs)
• profiles/default/types/AccoHall.xml (modified) (2 diffs)
• skins/waeup_accommodation/acco_folder_index.py (moved) (moved from WAeUP_SRP/trunk/skins/waeup_accommodation/accommodation_index.py) (1 diff)
• skins/waeup_accommodation/acco_folder_view.pt (moved) (moved from WAeUP_SRP/trunk/skins/waeup_accommodation/accommodation_view.pt) (1 diff)
• skins/waeup_accommodation/acco_hall_view.pt (modified) (1 diff)
• skins/waeup_accommodation/getAccoFolderInfo.py (moved) (moved from WAeUP_SRP/trunk/skins/waeup_accommodation/getAccoHallsInfo.py)
• skins/waeup_accommodation/getAccoHallInfo.py (moved) (moved from WAeUP_SRP/trunk/skins/waeup_accommodation/getHallInfo.py)
• skins/waeup_student/apply_admission.py (modified) (1 diff)

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

@@ -8 +8 @@
  <property name="product">WAeUP_SRP</property>
  <property name="factory">addAccoFolder</property>
- <property name="immediate_view">accommodation_index</property>
+ <property name="immediate_view">acco_folder_index</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
@@ -29 +29 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="accommodation_index"/>
- <alias from="view" to="accommodation_index"/>
+ <alias from="(Default)" to="acco_folder_index"/>
+ <alias from="view" to="acco_folder_index"/>
  <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/accommodation_index" visible="True">
+    url_expr="string:${object_url}/acco_folder_index" visible="True">
   <permission value="View"/>
  </action>

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

@@ -8 +8 @@
  <property name="product">WAeUP_SRP</property>
  <property name="factory">addAccoHall</property>
- <property name="immediate_view">accommodation_index</property>
+ <property name="immediate_view">acco_folder_index</property>
  <property name="global_allow">True</property>
  <property name="filter_content_types">True</property>
@@ -30 +30 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="accommodation_index"/>
- <alias from="view" to="accommodation_index"/>
+ <alias from="(Default)" to="acco_folder_index"/>
+ <alias from="view" to="acco_folder_index"/>
  <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}/accommodation_index" visible="True">
+    url_expr="string:${object_url}/acco_folder_index" visible="True">
   <permission value="View"/>
  </action>

WAeUP_SRP/trunk/skins/waeup_accommodation/acco_folder_index.py

@@ -24 +24 @@
 if context.isManager():
     if context.portal_type == 'AccoFolder':
-        return context.accommodation.accommodation_view()
+        return context.accommodation.acco_folder_view()
     elif context.portal_type == 'AccoHall':
         return context.acco_hall_view()

WAeUP_SRP/trunk/skins/waeup_accommodation/acco_folder_view.pt

@@ -1 @@
-<metal:html tal:define="info context/getAccoHallsInfo;
+<metal:html tal:define="info context/getAccoFolderInfo;
             is_manager info/is_manager|nothing;
             beds_generated options/beds_generated|nothing"

WAeUP_SRP/trunk/skins/waeup_accommodation/acco_hall_view.pt

@@ -1 @@
-<metal:html tal:define="info context/getHallInfo;
+<metal:html tal:define="info context/getAccoHallInfo;
             is_manager info/is_manager|nothing;"
             >

WAeUP_SRP/trunk/skins/waeup_student/apply_admission.py

@@ -49 +49 @@
           % (context.absolute_url(),s_id,pin.split('-')[2],pin))
 
-##    jamb_id = ds.get('jamb_reg_no')
-##    student = context.getContent().getStudentByRegNo(jamb_id)
-##    if student is None:
-##        psm = "JAMB record %s not accessible." % (jamb_id)
-##        return context.application_pin_form(rendered = res,
-##                                 psm = psm,
-##                                 #psm = "%s, %s" % (psm,ds),
-##                                 ds = ds,
-##                                 )
-##if context.portal_workflow.getInfoFor(student,'review_state',None) == "created":
-##    #student.invokeFactory('StudentClearance','clearance')
-##da = {}
-##pin = str(ds.get('app_ac_pin'))
-##da['app_ac_pin'] = pin
-##da['app_ac_date'] = current
-##apdoc.edit(mapping = da)
-
-
-# now display the passport form with jamb-data readonly
-##return context.REQUEST.RESPONSE.redirect("%s/application_form" % (student.application.absolute_url()))
-##return student.application_form()
-
 return