Ignore:
Timestamp:
19 Mar 2007, 18:57:54 (18 years ago)
Author:
uli
Message:

Merged current trunk into uli-branch.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • WAeUP_SRP/branches/uli/skins/waeup_student/getStudyCourseInfo.py

    r1537 r1593  
    5252levels = context.objectIds()
    5353review_state = wftool.getInfoFor(context,'review_state',None)
    54 if review_state != 'content_addable':
     54student_review_state = context.getStudentReviewState()
     55if review_state != 'content_addable' and student_review_state == 'school_fee_paid': #and context.isStudent():
    5556    wftool.doActionFor(context,'close_for_edit')
    56 student_review_state = context.getStudentReviewState()
    5757may_register = (student_review_state in ('school_fee_paid',)) and\
    5858               current_level not in levels and\
    5959               (sbrain.verdict in ('A','B') or sbrain.jamb_reg_no.startswith('6'))
    60                
     60
    6161levels.sort()
    6262info['create_level'] = None
     
    7272info['items'] = items
    7373
    74 try: 
     74try:
    7575    info['verdict'] = context.portal_vocabularies.verdicts.get(info['doc'].current_verdict).upper()
    7676except:
    77     info['verdict'] = course.current_verdict 
     77    info['verdict'] = course.current_verdict
    7878
    7979return info
Note: See TracChangeset for help on using the changeset viewer.