Changeset 851 for WAeUP_SRP/trunk/skins/waeup_student/clearance_edit.py

Timestamp:

12 Nov 2006, 17:01:34 (18 years ago)

Author:

joachim

Message:

new logig for the Apply/Finally? in application_edit and clearance_edit
the field acknow can be removed from clearance schema and layouts (to be done)

File:

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

WAeUP_SRP/trunk/skins/waeup_student/clearance_edit.py

@@ -5 +5 @@
 ##bind script=script
 ##bind subpath=traverse_subpath
-##parameters=REQUEST,proceed=None, cpsdocument_edit_button=None, final_submit=None, action=None
+##parameters=REQUEST, cpsdocument_edit_button=None, cpsdocument_edit_and_view_button=None, acknowledge=None
 ##title=
 # $Id$
@@ -34 +34 @@
 clear_doc = info['clear_doc']
 state = context.getStudentInfo()['review_state']
-if final_submit:
-    wftool.doActionFor(info['clear'],'close')
-    wftool.doActionFor(info['student'],'request_clearance')
-    return REQUEST.RESPONSE.redirect("%s/student_index" % info['url'])
 
 is_valid, ds = clear_doc.validate(request=REQUEST,
@@ -48 +44 @@
 args = {}
 action = "/clearance_edit_form"
-if cpsdocument_edit_button:
-    if is_valid:
+if is_valid:
+    if cpsdocument_edit_button:
         psm = 'Content changed.'
         if ds.get('acknow'):
             args['final_submit'] = "Finally Submit"
-    else:
-        args = getFormUidUrlArg(REQUEST)
-        psm = "Please correct your errors."
-        args['portal_status_message'] = psm
+    elif cpsdocument_edit_and_view_button:
+        if acknowledge:
+            wftool.doActionFor(info['clear'],'close')
+            wftool.doActionFor(info['student'],'request_clearance')
+            return REQUEST.RESPONSE.redirect("%s/student_index" % info['url'])
+        psm = "You didn't check the Acknowledgementbox"
+else:
+    psm = "Please correct your errors."
+args = getFormUidUrlArg(REQUEST)
+args['portal_status_message'] = psm
 if args:
   url = clear.absolute_url() + action + '?' + urlencode(args)