Ignore:
Timestamp:
15 Nov 2006, 17:30:45 (18 years ago)
Author:
joachim
Message:

added owner_guard and clearance_officer_guard
modified waeup_student_wf to use those.

Location:
WAeUP_SRP/trunk/skins/waeup_student
Files:
2 added
1 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/trunk/skins/waeup_student/clearance_edit_form_manager.pt

    r865 r870  
    6666             value="Reject Clearance"
    6767             id="reject_clearance_button"
    68              tal:condition="python:review_state == 'clearance_requested'" />
    69       <input type="submit" class="standalone"
    70              name="undo_clear_button"
    71              value="Undo Validate & Clear"
    72              id="undo_clear_button"
    7368             tal:condition="python:review_state == 'cleared_and_validated'" />
    7469      </form>

  • WAeUP_SRP/trunk/skins/waeup_student/clearance_edit_manager.py

    r858 r870  
    1919cpsdocument_edit_and_view_button = REQUEST.has_key('cpsdocument_edit_and_view_button')
    2020clear_and_validate_button = REQUEST.has_key('clear_and_validate_button')
    21 undo_clear_button = REQUEST.has_key('undo_clear_button')
    2221reject_clearance_button = REQUEST.has_key('reject_clearance_button')
    23 
    2422# Until ajax posts directly to its own script...
    2523##if 'ajax_edit' in REQUEST.form:
    … …  
    5250    elif cpsdocument_edit_and_view_button:
    5351        wftool.doActionFor(info['clear'],'close')
    54         wftool.doActionFor(info['student'],'request_clearance')
     52        wftool.doActionFor(info['student'],'request_clearance',dest_container=1)
    5553    elif clear_and_validate_button:
    5654        wftool.doActionFor(info['student'],'clear_and_validate')
    5755    elif reject_clearance_button:
    5856        wftool.doActionFor(info['clear'],'open')
    59         wftool.doActionFor(info['student'],'enter_clearance_pin')
    60     elif undo_clear_button:
    61         wftool.doActionFor(info['student'],'request_clearance')
     57        wftool.doActionFor(info['student'],'reject_clearance')
    6258else:
    6359    psm = "Please correct your errors."

  • WAeUP_SRP/trunk/skins/waeup_student/isClearanceOfficer.py

    r867 r870  
    55##bind script=script
    66##bind subpath=traverse_subpath
    7 ##parameters=REQUEST
     7##parameters=
    88##title=
    99##
    … …  
    1212
    1313"""
    14 request = REQUEST
    1514wftool = context.portal_workflow
    1615mtool = context.portal_membership
    … …  
    2322    return False
    2423   
    25 
    2624res = context.portal_catalog(portal_type="Department",id=info['course_doc'].department)
    27 if len res != 1:
     25if len(res) != 1:
    2826    return False
    2927
Note: See TracChangeset for help on using the changeset viewer.