Changeset 992 for WAeUP_SRP/trunk

Timestamp:

5 Dec 2006, 14:02:37 (18 years ago)

Author:

joachim

Message:

=fix for attribute Error

Location:

WAeUP_SRP/trunk

Files:

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

WAeUP_SRP/trunk/Widgets.py

@@ -493 +493 @@
                 #import pdb;pdb.set_trace()
                 if self.isStudent():
-                    student = self.getStudentInfo()['student']
                     s_id = student.getId()
+                    if self.reference == "jamb_reg_no":
+                        err = "You are already logged in" % s_id
+                        s_logger.info("Student %s logged in used Pin %s" % (s_id,pin))
+                        break
                     s_logger.info("Student %s used Pin %s" % (s_id,pin))
                     break

WAeUP_SRP/trunk/skins/waeup_student/check_admission.py

@@ -14 +14 @@
 wf = context.portal_workflow
 validate = REQUEST.has_key("cpsdocument_create_button")
+
+mtool = context.portal_membership
+is_anon = mtool.isAnonymousUser()
+member = mtool.getAuthenticatedMember()
 
 lt = context.portal_layouts
@@ -44 +48 @@
 elif psm == 'valid':
     s_id = ds.get('s_id')
+    if not s_id and not is_anon:
+        s_id = str(member)
+    elif not is_anon:
+        return context.check_admission_pin_form(rendered = res,
+                                 psm = "Please log out and try again",
+                                 #psm = "%s, %s" % (psm,ds),
+                                 firstlayout = True,
+                                 lastlayout = True,
+                                 ds = ds,
+                                 )
+        
 ##  
 ##    email = ds.get('app_email')
@@ -51 +66 @@
         url = "%s/campus/students/%s/pume/admission_rejected_view" % (context.portal_url(),s_id)
         return redirect(url)
-    pin = str(ds.get('app_ac_pin'))
+    pin = str(ds.get('app_ac_pin_n'))
     args = {}
     args['__ac_name'] = s_id
-    args['__ac_password'] = pin.split('-')[2]
+    #args['__ac_password'] = pin.split('-')[2]
+    args['__ac_password'] = pin
     args['pin'] = pin
 ##    args['email'] = email