Changeset 1304


Ignore:
Timestamp:
15 Jan 2007, 22:46:27 (18 years ago)
Author:
Henrik Bettermann
Message:

duplicate workflow transition removed
workflow portlet slightly changed

Location:
WAeUP_SRP/trunk/skins
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • WAeUP_SRP/trunk/skins/waeup_epayment/epayment_cb.py

    r1303 r1304  
    4242context.getContent().edit(mapping=pd)
    4343wftool.doActionFor(student,'pay_school_fee')
    44 wftool.doActionFor(context,'close')
     44#wftool.doActionFor(context,'close')
    4545
    46 return request.RESPONSE.redirect("%s/waeup_document_view" % context.absolute_url()) 
     46return request.RESPONSE.redirect("%s/waeup_document_view" % context.absolute_url())

  • WAeUP_SRP/trunk/skins/waeup_epayment/pay_online.py

    r1303 r1304  
    3333##    logger.info('"%s","certificate not found", "%s"' % (student_id,course))
    3434##    sfc = "ART"
    35 ##else:   
     35##else:
    3636##    sfc = res[0].getPath().split('/')[-4]
    3737info = {}
    … …  
    7171payment.getContent().edit(mapping=d)
    7272wftool.doActionFor(payment,'close')
    73 wftool.doActionFor(student,'pay_school_fee')
     73#wftool.doActionFor(student,'pay_school_fee')
    7474info['callback_url'] = "%s/payments/%s/epayment_cb" % (student.absolute_url(),p_id)
    7575if context.portal_url().find('uniben-demo.waeup.org') >-1 or\

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

    r1286 r1304  
    2828info['url'] = student.absolute_url()
    2929review_state = info['review_state'] = wf.getInfoFor(student,'review_state',None)
    30 info['returning'] = review_state in  ('returning',
     30info['cr'] = review_state in  ('returning',
    3131                                           'school_fee_paid',
    3232                                           'courses_registered',
    3333                                           'courses_validated',
    3434                                           )
     35
    3536return info

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

    r1286 r1304  
    33           condition="context/isStudent">       
    44
    5 <table class="registration" tal:condition="not:info/returning">
     5<table class="registration" tal:condition="not:info/cr">
    66  <span tal:condition="python:path('info/review_state')=='application_pin_entered'">
    77  <tr><td class="active">
    … …  
    102102</table>
    103103
    104 <table class="registration" tal:condition="info/returning">
     104<table class="registration" tal:condition="info/cr">
    105105  <span tal:condition="python:info['review_state']=='returning'">
    106106  <tr><td class="active">
    … …  
    108108    Returning
    109109    </a>
    110   </td></tr>
    111   </span>
    112   <span tal:condition="python:info['review_state']!='returning'">
    113   <tr><td>
    114     Returning
    115110  </td></tr>
    116111  </span>
Note: See TracChangeset for help on using the changeset viewer.