Changeset 851 for WAeUP_SRP/trunk/skins/waeup_student/application_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/application_edit.py (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_student/application_edit.py

@@ -5 +5 @@
 ##bind script=script
 ##bind subpath=traverse_subpath
-##parameters=REQUEST,proceed=None, cpsdocument_edit_button=None, action=None
+##parameters=REQUEST, cpsdocument_edit_button=None, cpsdocument_edit_and_view_button=None, action=None
 ##title=
 # $Id$
@@ -42 +42 @@
 base_url = app.absolute_url()
 
-if app_doc.passport is not None:
-    args['proceed'] = 'Continue'
-
-if cpsdocument_edit_button:
-    if is_valid:
+if is_valid:
+    if cpsdocument_edit_button:
         if app_doc.passport is not None:
             args['portal_status_message'] = 'You successfully uploaded your passport picture.'
         else:
             args['portal_status_message'] = "You didn't upload a passport picture."
-elif proceed:
-    if is_valid:
-        action = "/start_clearance"
-        base_url = student.absolute_url()
-        url = base_url + action
-        return REQUEST.RESPONSE.redirect(url)
-    else:
-        args['portal_status_message'] = 'psm_content_error'
+    elif cpsdocument_edit_and_view_button:
+        if app_doc.passport is not None:
+            action = "/start_clearance"
+            base_url = student.absolute_url()
+            url = base_url + action
+            return REQUEST.RESPONSE.redirect(url)
+        else:
+            args['portal_status_message'] = "You didn't upload a passport picture."
 if args:
   url = base_url + action + '?' + urlencode(args)