Changeset 1001 for WAeUP_SRP/trunk/skins

Timestamp:

6 Dec 2006, 14:08:48 (18 years ago)

Author:

joachim

Message:

double call in raise_objection fixed (in custom)
pins_view faster (not in custom)

Location:

WAeUP_SRP/trunk/skins

Files:

• waeup_pins/pins_view.pt (modified) (1 diff)
• waeup_student/raise_objection.py (modified) (1 diff)

WAeUP_SRP/trunk/skins/waeup_pins/pins_view.pt

@@ -7 +7 @@
         <h3>PIN Batches</h3>
         <br />
-        <table tal:define="batches python: context.objectValues()">
+        <table tal:define="batches python: context.portal_catalog(portal_type='ScratchCardBatch')">
           <tr tal:repeat="batch batches">
-            <span tal:omit-tag="" tal:define="info python: context.getBatchInfo(batch)">
             <td><a href="batch" 
-                   tal:attributes="href string:${batch/absolute_url}"
-                   tal:content="info/title"></a></td>    
-            </span>
+                   tal:attributes="href string:${batch/getPath}"
+                   tal:content="batch/Title"></a></td>    
           </tr>
         </table>

WAeUP_SRP/trunk/skins/waeup_student/raise_objection.py

@@ -23 +23 @@
 
 info['app_doc'].edit(mapping={'objection_date':current,})
-wf.doActionFor(info['student'],'raise_objection')
-return context.objection_raised_form(info=info)
+if info['review_state'] == "admitted":
+    wf.doActionFor(info['student'],'raise_objection')
+    return context.objection_raised_form(info=info)
+return context.admission_form()