Changeset 1613

Timestamp:

21 Mar 2007, 07:18:53 (18 years ago)

Author:

joachim

Message:

implementation of the requery module, will now test it on the uniben-demo

M profiles/default/schemas/payment.xml
AM skins/waeup_epayment/requery_payment.py
AM skins/waeup_epayment/requery_payment_form.pt
M skins/waeup_epayment/getPaymentsFolderInfo.py
M skins/waeup_epayment/payments_view.pt

catch unauthorized delets, must be testet.
M skins/waeup_student/delete_course_result.py

Location:

WAeUP_SRP/trunk

Files:

• profiles/default/schemas/payment.xml (modified) (1 diff)
• skins/waeup_epayment/getPaymentsFolderInfo.py (modified) (1 diff)
• skins/waeup_epayment/payments_view.pt (modified) (1 diff)
• skins/waeup_epayment/requery_payment.py (added)
• skins/waeup_epayment/requery_payment_form.pt (added)
• skins/waeup_student/delete_course_result.py (modified) (2 diffs)

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

@@ -6 +6 @@
   <field name="type_description" meta_type="CPS String Field" >
     <property name="is_searchabletext">True</property>
-  </field> <field name="order_id" meta_type="CPS String Field"/>
+  </field> 
   <field name="amount" meta_type="CPS String Field"/>
   <field name="resp_pay_reference" meta_type="CPS String Field"/>

WAeUP_SRP/trunk/skins/waeup_epayment/getPaymentsFolderInfo.py

@@ -53 +53 @@
     else:
         row['is_approvable'] = is_so and (review_state == "opened")
+    if so_object.type_description.startswith('School Fee'):
+        row['is_requeryable'] = (review_state == "opened") and info['review_state'] == 'cleared_and_validated'
+    else:
+        row['is_requeryable'] = is_so and (review_state == "opened")
     if (review_state == "closed") and so_object.resp_code in ('SC','00','AP',):
         row['confirmed'] = 'active'

WAeUP_SRP/trunk/skins/waeup_epayment/payments_view.pt

@@ -34 +34 @@
             </td>
             <td>
-            <a tal:condition="python:row['is_approvable']"
+            <a tal:condition="row/is_approvable"
                tal:attributes="href string:${context/absolute_url}/${row/id}/approve_epayment;
                                onclick python:'return window.confirm(\'%s\')' %(cpsmcat('Are you sure? You will not be able to undo the approval.'), );
                                ">
                 [approve payment]
+            </a>             
+            </td>
+            <td>
+            <a tal:condition="row/is_requeryable"
+               tal:attributes="href string:${context/absolute_url}/${row/id}/requery_payment;
+                               onclick python:'return window.confirm(\'%s\')' %(cpsmcat('Are you sure? You will not be able to undo the approval.'), );
+                               ">
+                [requery payment]
             </a>             
             </td>

WAeUP_SRP/trunk/skins/waeup_student/delete_course_result.py

@@ -14 +14 @@
 
 from Products.CMFCore.utils import getToolByName
+from AccessControl import Unauthorized
+
 here = context
 from urllib import urlencode
@@ -30 +32 @@
             real_ids.append(id)
     if real_ids:
-        context.manage_delObjects(real_ids)
-        logger.info('%s deleted StudentCourseResult object %s for %s' % (member,id,context.getStudentId()))
-        message = 'psm_item(s)_deleted'
+        try:
+            context.manage_delObjects(real_ids)
+            logger.info('%s deleted StudentCourseResult object %s for %s' % (member,id,context.getStudentId()))
+            message = 'psm_item(s)_deleted'
+        except Unauthorized:
+            logger.info('%s has no permission to delete StudentCourseResult objects for %s' % (member,context.getStudentId()))
+            message = 'no item(s) deleted'
 else:
     message = 'psm_select_at_least_one_document'