Changeset 1839

Timestamp:

31 May 2007, 10:18:04 (17 years ago)

Author:

joachim

Message:

better fix for 238 (in custom)

File:

• WAeUP_SRP/trunk/skins/waeup_student/clearance_edit.py (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_student/clearance_edit.py

@@ -66 +66 @@
                                 use_session=True)
 
-
-if is_valid:
+if clear_and_validate_button and info['review_state'] == "clearance_requested":
+    logger.info('%s cleared %s' % (member_id,student_id ))
+    #from Products.zdb import set_trace
+    #set_trace()
+    info['clear_doc'].edit(mapping = {'cleared_date': current,})
+    wftool.doActionFor(info['student'],'clear_and_validate')
+    psm = "Clearance and eligibility record is validated and and student is cleared!"
+elif clear_and_validate_button and info['review_state'] == "cleared_and_validated":
+    psm = "This student is already cleared!"
+elif reject_clearance_button:
+    logger.info('%s rejected clearance for %s' % (member_id,student_id ))
+    wftool.doActionFor(info['clear'],'open')
+    wftool.doActionFor(info['student'],'reject_clearance')
+    action = "/external_contact_student_form"
+    psm = "Student's clearance request has been rejected! Please fill and submit the form below!"
+    subject = "Clearance request rejected"
+    args['subject'] = subject
+    args['continue'] = 'external_clearance_edit_form'
+elif is_valid:
     if cpsdocument_edit_button or result_edit_button:
         psm = "Content changed!"
@@ -107 +124 @@
         else:
             psm = "You must tick the acknowledgement check box before submission!"
-elif clear_and_validate_button and info['review_state'] == "clearance_requested":
-    logger.info('%s cleared %s' % (member_id,student_id ))
-    #from Products.zdb import set_trace
-    #set_trace()
-    info['clear_doc'].edit(mapping = {'cleared_date': current,})
-    wftool.doActionFor(info['student'],'clear_and_validate')
-    psm = "Clearance and eligibility record is validated and and student is cleared!"
-elif clear_and_validate_button and info['review_state'] == "cleared_and_validated":
-    psm = "This student is already cleared!"
-elif reject_clearance_button:
-    logger.info('%s rejected clearance for %s' % (member_id,student_id ))
-    wftool.doActionFor(info['clear'],'open')
-    wftool.doActionFor(info['student'],'reject_clearance')
-    action = "/external_contact_student_form"
-    psm = "Student's clearance request has been rejected! Please fill and submit the form below!"
-    subject = "Clearance request rejected"
-    args['subject'] = subject
-    args['continue'] = 'external_clearance_edit_form'
 else:
     psm = "Please correct your errors!"