Changeset 1789 for WAeUP_SRP/trunk/skins/waeup_custom

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)

File:

• WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py (modified) (2 diffs)

WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py

@@ -74 +74 @@
         logger.info('%s logged in, review_state %s' % (member,s_review_state))
         app_doc = student_app.getContent()
-        
+
         if request.has_key('returning'):
             email=request.get("email")
-            phone=request.get("phone_nr")        
+            phone=request.get("phone_nr")
             # should be always closed, however ...
             if a_review_state != 'opened':
                 wftool.doActionFor(student_app,'open')
             # should be always opened after import, however ...
-            if p_review_state != 'opened':    
+            if p_review_state != 'opened':
                 wftool.doActionFor(student_per,'open')
             per_doc = student_per.getContent()
@@ -88 +88 @@
             per_doc.edit(mapping = {'email' : email, 'phone' : phone})
             wftool.doActionFor(student_app,'close')
-        
+
         #from Products.zdb import set_trace;set_trace()
-        if load_passport and 'passport' not in app_doc.objectIds():
+        if s_review_state == 'returning' and load_passport and 'passport' not in app_doc.objectIds():
             msg = context.waeup_tool.loadStudentFoto(student)
             logger.info('%s, %s' % (member,msg))
-        if s_review_state in ("student_created","admitted") and\
+        elif s_review_state in ("student_created","admitted") and\
                              a_review_state == 'created' :
             wftool.doActionFor(student_app,'open')