Changeset 695 for WAeUP_SRP/trunk

Timestamp:

13 Oct 2006, 20:59:54 (18 years ago)

Author:

joachim

Message:

added link to Student in Bedlist
renamed pins_index_html to pins_view
and batch_index_html batch_view

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/types/ScratchCardBatch.xml (modified) (1 diff)
• profiles/default/types/ScratchCardBatchesFolder.xml (modified) (1 diff)
• skins/waeup_accommodation/acco_hall_view.pt (modified) (1 diff)
• skins/waeup_accommodation/getAccoHallInfo.py (modified) (2 diffs)
• skins/waeup_pins/batch_view.pt (moved) (moved from WAeUP_SRP/trunk/skins/waeup_pins/batch_index_html.pt)
• skins/waeup_pins/pins_view.pt (moved) (moved from WAeUP_SRP/trunk/skins/waeup_pins/pins_index_html.pt)

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

@@ -26 +26 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="batch_index_html"/>
+ <alias from="(Default)" to="batch_view"/>
  <alias from="create_do" to="scratch_card_batch_create_do"/>
  <alias from="created" to="scratch_card_batch_created"/>
- <alias from="view" to="batch_index_html"/>
+ <alias from="view" to="batch_view"/>
  <action title="View" action_id="view" category="object"
-    condition_expr="" url_expr="string:${object_url}/batch_index_html"
+    condition_expr="" url_expr="string:${object_url}/batch_view"
     visible="True">
   <permission value="Modify portal content"/>

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

@@ -25 +25 @@
  <property name="storage_methods"/>
  <property name="cps_is_portlet">False</property>
- <alias from="(Default)" to="pins_index_html"/>
+ <alias from="(Default)" to="pins_view"/>
  <alias from="create_do" to=""/>
  <alias from="created" to=""/>
- <alias from="view" to="pins_index_html"/>
+ <alias from="view" to="pins_view"/>
  <action title="View" action_id="view" category="object"
-    condition_expr="" url_expr="string:${object_url}/pins_index_html"
+    condition_expr="" url_expr="string:${object_url}/pins_view"
     visible="True">
   <permission value="View"/>

WAeUP_SRP/trunk/skins/waeup_accommodation/acco_hall_view.pt

@@ -39 +39 @@
         </tr>
         <tr tal:repeat="bt reserved">
-          <td tal:content="bt/student" />
+          <td> 
+            <a href="" tal:attributes="href bt/student_url"
+               tal:content="bt/student"></a>
+          </td>
           <td tal:content="bt/bed" />
         </tr>

WAeUP_SRP/trunk/skins/waeup_accommodation/getAccoHallInfo.py

@@ -39 +39 @@
 info['bed_types'] = bt_list
 res_list = []
+students_rpath = context.portal_catalog(meta_type = "StudentsFolder")[-1].relative_path
+students_url = "%s/%s" % (context.portal_url(),students_rpath)
 if reserved > 1:
     for st in reserved:
@@ -44 +46 @@
             res = pa(hall=context.getId(),student=st)
             if res:
-                res_list.append({'student': st, 'bed': context.formatBed(res[0].bed) })
+                res_list.append({'student': st,
+                                 'student_url': '%s/%s' % (students_url,st),
+                                 'bed': context.formatBed(res[0].bed) })
 info['reserved'] = res_list