Changeset 1913 for WAeUP_SRP/trunk

Timestamp:

17 Jun 2007, 05:56:26 (17 years ago)

Author:

Henrik Bettermann

Message:

ticket #197

Joachim, please check what we have to to in waeup_tool.loadStudentFoto.

File:

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

WAeUP_SRP/trunk/skins/waeup_custom/logged_in.py

@@ -36 +36 @@
 is_anon = mtool.isAnonymousUser()
 member = mtool.getAuthenticatedMember()
-load_passport = hasattr(context.waeup_tool,'loadStudentFoto')
+#load_passport = hasattr(context.waeup_tool,'loadStudentFoto')
 
 if not is_anon:
@@ -90 +90 @@
 
         #from Products.zdb import set_trace;set_trace()
-        if s_review_state == 'returning' and load_passport and 'passport' not in app_doc.objectIds():
+        if s_review_state == 'returning' and 'passport' not in app_doc.objectIds():
             folder = 'pictures_returning'
             res = context.students_catalog(id = str(member))
@@ -96 +96 @@
             msg = context.waeup_tool.loadStudentFoto(student,filename,folder)
             logger.info('%s, %s' % (member,msg))
-        if s_review_state == 'admitted' and load_passport and 'passport' not in app_doc.objectIds():
+        if s_review_state in ('admitted', 'clearance_pin_entered', 'clearance_requested')  and 'passport' not in app_doc.objectIds():
             folder = 'pictures_admitted_latest'
             filename = app_doc.jamb_reg_no.replace('/','_')