Changeset 2476


Ignore:
Timestamp:
29 Oct 2007, 21:53:10 (17 years ago)
Author:
Henrik Bettermann
Message:

move verdict also after interswitch payment

Location:
WAeUP_SRP/base/skins
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • WAeUP_SRP/base/skins/waeup_epayment/interswitch_cb.py

    r2475 r2476  
    9393            pass
    9494        verdict = s_brain.verdict
     95        if verdict == 'N/A':
     96            verdict = ''
    9597        study_course.getContent().edit(mapping= {'current_level': next_level_id,
    9698                                                 'current_session': next_session_id,
     99                                                 'current_verdict': next_verdict,
    97100                                                 'previous_verdict': verdict,
    98101                                                 })
  • WAeUP_SRP/base/skins/waeup_student/getStudyCourseInfo.py

    r2475 r2476  
    8484info['items'] = items
    8585
    86 try:
    87     info['verdict'] = context.portal_vocabularies.verdicts.get(info['doc'].current_verdict).upper()
    88 except:
    89     info['verdict'] = course.current_verdict
    90 try:
    91     info['previous_verdict'] = context.portal_vocabularies.verdicts.get(info['doc'].previous_verdict).upper()
    92 except:
    93     info['previous_verdict'] = course.previous_verdict
    94 
     86if hasattr(course,'current_verdict'):
     87    try:
     88        info['verdict'] = context.portal_vocabularies.verdicts.get(course.current_verdict).upper()
     89    except:
     90        info['verdict'] = course.current_verdict
     91else:
     92    info['verdict'] = ''   
     93     
     94if hasattr(course,'previous_verdict'):       
     95    try:
     96        info['previous_verdict'] = context.portal_vocabularies.verdicts.get(course.previous_verdict).upper()
     97    except:
     98        info['previous_verdict'] = course.previous_verdict
     99else:
     100    info['previous_verdict'] = ''
     101   
    95102return info
    96103
Note: See TracChangeset for help on using the changeset viewer.