Changeset 106 for waeup_product/trunk/skins/waeup_student/check_admission.py

Timestamp:

27 Oct 2005, 19:30:56 (19 years ago)

Author:

joachim

Message:

=fixes for Henrik

File:

• waeup_product/trunk/skins/waeup_student/check_admission.py (modified) (2 diffs)

waeup_product/trunk/skins/waeup_student/check_admission.py

@@ -35 +35 @@
 elif psm == 'valid':
     s_id = "s%s" % ds.get('jamb_id')
-    sf = getattr(context,s_id,None)
-    if sf is None:
+    catalog = context.portal_catalog
+    search = catalog(SearchableText = "%s*" % s_id)
+    if len(search) < 1:
         psm = "Your not admitted"
         return context.check_admission_form(rendered = res,
-                                 psm = psm,
+                                 psm = psm + str(search),
                                  ds = ds,
                                  )
-    elif hasattr(sf,'PERSONAL'):
-        psm = "Your already admitted"
+    sf = getattr(context,s_id,None)
+    if sf and getattr(sf,'PERSONAL',None):
+        psm = "Your already admitted, pleae login"
         return context.check_admission_form(rendered = res,
                                  psm = psm,
@@ -52 +54 @@
     return REQUEST.RESPONSE.redirect("%s/logged_in?__ac_name=%s&__ac_password=UnSeT&sc_pin=%s" 
                                     % (context.absolute_url(),s_id,sc_pin))
-    return context.student_admitted_form(rendered = res,
-                                 psm = psm,
-                                 ds = ds,
-                                 student = student,
-                                 jamb = jamb,
-                                 pd = pd,
-                                 )
-    
-return res,psm,ds
+##    return context.student_admitted_form(rendered = res,
+##                                 psm = psm,
+##                                 ds = ds,
+##                                 student = student,
+##                                 jamb = jamb,
+##                                 pd = pd,
+##                                 )
+##    
+##return res,psm,ds