Changeset 3409 for WAeUP_SRP/base/skins/waeup_student

Timestamp:

3 Apr 2008, 07:42:06 (17 years ago)

Author:

joachim

Message:

dont show pin, if invalid input

Location:

WAeUP_SRP/base/skins/waeup_student

Files:

• apply_admission.py (modified) (3 diffs)
• apply_admission_form.pt (modified) (1 diff)

WAeUP_SRP/base/skins/waeup_student/apply_admission.py

@@ -116 +116 @@
 
 pin = request.form.get('pin','')
-reg_no = request.get('widget__reg_no','').upper()
-if not reg_no:
-    reg_no = request.form.get('reg_no','').upper()
+# reg_no = request.get('widget__reg_no','').upper()
+# if not reg_no:
+#     reg_no = request.form.get('reg_no','').upper()
+reg_no = request.form.get('reg_no','').upper()
 if not reg_no:
     reg_no = request.get('widget__pin_n','').upper()
-
 object = {}
 if reg_no:
@@ -143 +143 @@
             #logger.info('%s/%s entered wrong pin %s' % (member,reg_no,pin))
             #return request.RESPONSE.redirect("%s/srp_anonymous_view" % context.portal_url())
-
-
-
 info = {}
-
 info['status'] = object.get('status','')
 if traverse_subpath and traverse_subpath[0] in screening_types:
@@ -192 +188 @@
                                         info = info,
                                        )
-elif psm == '' and not manage:
+info['reg_no'] = ds.get('reg_no')
+info['pin'] = ds.get('pin')
+if psm == '' and not manage:
     return context.apply_admission_form(rendered = res,
                                         psm = psm,

WAeUP_SRP/base/skins/waeup_student/apply_admission_form.pt

@@ -30 +30 @@
                  tal:condition="info/screening_type|nothing"/>
           <input type="hidden" name="reg_no"
-                 tal:attributes="value ds/reg_no|nothing"
-                 tal:condition="ds/reg_no|nothing"/>
+                 tal:attributes="value info/reg_no|nothing"
+                 tal:condition="info/reg_no|nothing"/>
           <input type="hidden" name="pin"
-                 tal:attributes="value ds/pin|nothing"
-                 tal:condition="ds/pin|nothing"/>
+                 tal:attributes="value info/pin|nothing"
+                 tal:condition="info/pin|nothing"/>
           <input type="hidden" name="expiration_date"
                  tal:attributes="value info/expiration_date|nothing"