Changeset 6759

Timestamp:

14 Sep 2011, 02:02:05 (13 years ago)

Author:

uli

Message:

Same for clearance pin.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/students

Files:

• browser.py (modified) (1 diff)
• browser_templates/enterpin.pt (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py

@@ -703 +703 @@
     title = 'Start clearance'
     label = 'Start clearance'
-    acprefix = 'CLR'
+    ac_prefix = 'CLR'
     pnav = 4
     buttonname = 'Start'
 
     def update(self, SUBMIT=None):
-        # We must not use form.ac_series and form.ac_number in forms
-        # since these are interpreted as applicant credentials in the
-        # applicants package
-        self.acseries = self.request.form.get('form.acseries', None)
-        self.acnumber = self.request.form.get('form.acnumber', None)
+        self.ac_series = self.request.form.get('ac_series', None)
+        self.ac_number = self.request.form.get('ac_number', None)
 
         if SUBMIT is None:
             return
-        pin = '%s-%s-%s' % (self.acprefix,self.acseries,self.acnumber)
+        pin = '%s-%s-%s' % (self.ac_prefix, self.ac_series, self.ac_number)
         code = get_access_code(pin)
         if not code:

main/waeup.sirp/trunk/src/waeup/sirp/students/browser_templates/enterpin.pt

@@ -1 @@
-<h2 i18n:translate=""  tal:condition="view/label"  tal:content="view/label">Label</h2>
+<h2 i18n:translate=""  tal:condition="view/label"
+    tal:content="view/label">Label</h2>
 <form method="POST">
-  <input type="hidden" name="form.acprefix"  value="" tal:attributes="value view/acprefix" />
   <table>
     <tbody>
+      <tr><td>
+        <label for="ac_series">Access Code:</label>
+        </td><td>
+        <span tal:replace="view/ac_prefix">PIN Prefix</span> -
+        <input name="ac_series" type="text" size="3" maxlength="3"
+               value="" tal:attributes="value view/ac_series"/> -
+        <input name="ac_number" type="text" size="10" maxlength="10"
+               value="" tal:attributes="value view/ac_number" /></td>
+      </tr>
       <tr>
-        <tr> <td>
-            <label for="form.acseries">Access Code:
-            </label></td> <td>
-            <span tal:replace="view/acprefix">PIN Prefix
-            </span> -
-            <input name="form.acseries" type="text" size="3" maxlength="3"  value="" tal:attributes="value view/acseries"/> -
-            <input name="form.acnumber" type="text" size="10" maxlength="10"  value="" tal:attributes="value view/acnumber" /> </td>
-        </tr>
-        <tr>
-          <td colspan="2">
-            <input type="submit" name="SUBMIT" tal:attributes="value view/buttonname" /> </td>
-        </tr>
+        <td colspan="2">
+          <input type="submit" name="SUBMIT"
+                 tal:attributes="value view/buttonname" /> </td>
+      </tr>
     </tbody>
   </table>