Changeset 1789 for WAeUP_SRP/trunk/skins


Ignore:
Timestamp:
16 May 2007, 12:39:40 (18 years ago)
Author:
Henrik Bettermann
Message:
  • logged_in.py: don't look for passport picture if not in state returning
  • study_level_view.pt: deactivate update button (in custom)
Location:
WAeUP_SRP/trunk/skins
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py

    r1781 r1789  
    7474        logger.info('%s logged in, review_state %s' % (member,s_review_state))
    7575        app_doc = student_app.getContent()
    76        
     76
    7777        if request.has_key('returning'):
    7878            email=request.get("email")
    79             phone=request.get("phone_nr")       
     79            phone=request.get("phone_nr")
    8080            # should be always closed, however ...
    8181            if a_review_state != 'opened':
    8282                wftool.doActionFor(student_app,'open')
    8383            # should be always opened after import, however ...
    84             if p_review_state != 'opened':   
     84            if p_review_state != 'opened':
    8585                wftool.doActionFor(student_per,'open')
    8686            per_doc = student_per.getContent()
     
    8888            per_doc.edit(mapping = {'email' : email, 'phone' : phone})
    8989            wftool.doActionFor(student_app,'close')
    90        
     90
    9191        #from Products.zdb import set_trace;set_trace()
    92         if load_passport and 'passport' not in app_doc.objectIds():
     92        if s_review_state == 'returning' and load_passport and 'passport' not in app_doc.objectIds():
    9393            msg = context.waeup_tool.loadStudentFoto(student)
    9494            logger.info('%s, %s' % (member,msg))
    95         if s_review_state in ("student_created","admitted") and\
     95        elif s_review_state in ("student_created","admitted") and\
    9696                             a_review_state == 'created' :
    9797            wftool.doActionFor(student_app,'open')
  • WAeUP_SRP/trunk/skins/waeup_student/study_level_view.pt

    r1783 r1789  
    112112                     ('Do you really want to delete selected courses?', )"
    113113                     />
    114               <input type="submit" name="refresh_level:method"
     114              <input tal:condition="python: 0" type="submit" name="refresh_level:method"
    115115                     class="context" value="Update"
    116116                     />
     
    127127              <br /><br />
    128128             
     129              <span tal:condition="python: 0">
    129130              <strong>Note:</strong> 'Update' checks for all courses in your certificate and will add them to your course list irrespective of
    130131              prior deletion, i.e. already deleted courses will show up again.
    131              
    132132              Please use this function only if you are sure that your faculty has added courses which are not yet on your course list.                               
     133              </span>
     134              <span tal:condition="python: 1">
     135              <strong>Note:</strong> The 'Update' function has been temporarily disabled.                                 
     136              </span>             
    133137                     
    134138          </td>
Note: See TracChangeset for help on using the changeset viewer.