Changeset 858 for WAeUP_SRP/trunk/skins/waeup_student/clearance_edit_manager.py

Timestamp:

13 Nov 2006, 15:39:08 (18 years ago)

Author:

joachim

Message:

clearance_edit_manager + clearance_edit_form_manager modified that all
buttons are shown according to the student's workflow-state.
The waeup_student_wf was modified, to allow the transitions
Even though the enter_clearance_pin-transition is allowed for Manager
in the clearance_requested state, the reject_clearance button does not work.

File:

• WAeUP_SRP/trunk/skins/waeup_student/clearance_edit_manager.py (modified) (5 diffs)

WAeUP_SRP/trunk/skins/waeup_student/clearance_edit_manager.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
 ##title=
-# $Id: clearance_edit.py 832 2006-11-10 16:52:23Z joachim $
+# $Id: clearance_edit.py 852 2006-11-12 21:21:07Z henrik $
 """
 """
@@ -16 +16 @@
 current = DateTime.DateTime()
 
+cpsdocument_edit_button = REQUEST.has_key('cpsdocument_edit_button')
+cpsdocument_edit_and_view_button = REQUEST.has_key('cpsdocument_edit_and_view_button')
+clear_and_validate_button = REQUEST.has_key('clear_and_validate_button')
+undo_clear_button = REQUEST.has_key('undo_clear_button')
+reject_clearance_button = REQUEST.has_key('reject_clearance_button')
+
 # Until ajax posts directly to its own script...
 ##if 'ajax_edit' in REQUEST.form:
 ##    return context.cpsdocument_edit_ajax(REQUEST, cluster=cluster)
-
-# Check flexible controls
-#context.editLayouts(REQUEST=REQUEST)
 
 # Validate the document and write it if it's valid
@@ -33 +36 @@
 clear = info['clear']
 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'])
+review_state = info['review_state']
 
 is_valid, ds = clear_doc.validate(request=REQUEST,
@@ -48 +47 @@
 args = {}
 action = "/clearance_edit_form_manager"
-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:
+        wftool.doActionFor(info['clear'],'close')
+        wftool.doActionFor(info['student'],'request_clearance')
+    elif clear_and_validate_button:
+        wftool.doActionFor(info['student'],'clear_and_validate')
+    elif reject_clearance_button:
+        wftool.doActionFor(info['clear'],'open')
+        wftool.doActionFor(info['student'],'enter_clearance_pin')
+    elif undo_clear_button:
+        wftool.doActionFor(info['student'],'request_clearance')
+else:
+    psm = "Please correct your errors."
+args = getFormUidUrlArg(REQUEST)
+args['review_state'] = review_state
+args['portal_status_message'] = psm
 if args:
   url = clear.absolute_url() + action + '?' + urlencode(args)
@@ -62 +70 @@
   url = clear.absolute_url() + action
 REQUEST.RESPONSE.redirect(url)
-