Changeset 997

Timestamp:

6 Dec 2006, 07:36:54 (18 years ago)

Author:

Henrik Bettermann

Message:

upper was missing

Location:

WAeUP_SRP/trunk

Files:

• WAeUPTables.py (modified) (1 diff)
• Widgets.py (modified) (2 diffs)
• skins/waeup_student/check_admission.py (modified) (2 diffs)

WAeUP_SRP/trunk/WAeUPTables.py

@@ -163 +163 @@
         if record.student.upper() != student_id.upper():
             return 0
-        if record.student == student_id:
+        if record.student.upper() == student_id.upper():
             return 2
+        return -3
 
 InitializeClass(PinTable)

WAeUP_SRP/trunk/Widgets.py

@@ -487 +487 @@
                 err = 'Invalid PIN'
                 break
+            elif ok == -3:
+                err = 'Unknown error, please report!'
+                break                
             if ok == 0:
                 err = 'PIN already used.'
@@ -494 +497 @@
                 if self.isStudent():
                     if self.reference == "jamb_reg_no":
-                        err = "You are already logged in"
+                        err = "You are already logged in."
                         s_logger.info("Student %s logged in used Pin %s" % (ref,pin))
                         break

WAeUP_SRP/trunk/skins/waeup_student/check_admission.py

@@ -48 +48 @@
 elif psm == 'valid':
     s_id = ds.get('s_id')
+    if is_anon and not s_id:
+        return context.check_admission_pin_form(rendered = res,
+                                 psm = "You are not allowed to call this form in this context. Please try to log in.",
+                                 #psm = "%s, %s" % (psm,ds),
+                                 firstlayout = True,
+                                 lastlayout = True,
+                                 ds = ds,
+                                 )
+    elif not is_anon:
+        return context.check_admission_pin_form(rendered = res,
+                                 psm = "You are already logged in!",
+                                 #psm = "%s, %s" % (psm,ds),
+                                 firstlayout = True,
+                                 lastlayout = True,
+                                 ds = ds,
+                                 )
 ##  
 ##    email = ds.get('app_email')
@@ -64 +80 @@
     url = "%s/logged_in?%s" % (context.absolute_url(),urlencode(args))
     return redirect(url)
+