Changeset 6758 for main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py

Timestamp:

14 Sep 2011, 01:56:26 (13 years ago)

Author:

uli

Message:

Use more simple form names, fix nesting errors, etc.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py (modified) (4 diffs)

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

@@ -151 +151 @@
     title = ''
     label = 'Set password for first-time login'
-    acprefix = 'PWD'
+    ac_prefix = 'PWD'
     pnav = 0
 
     def update(self, SUBMIT=None):
-        self.reg_number = self.request.form.get('form.reg_number', 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.reg_number = self.request.form.get('reg_number', 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:
@@ -174 +172 @@
         self.student_id = student.student_id
         student_pw = student.password
-        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:
@@ -197 +195 @@
             #import pdb; pdb.set_trace()
             invalidate_accesscode(pin,comment)
-            IUserAccount(student).setPassword(self.acnumber)
+            IUserAccount(student).setPassword(self.ac_number)
         self.flash('Password has been set. Your Student Id is %s'
             % self.student_id)
@@ -657 +655 @@
     form_fields = grok.AutoFields(
         IStudentClearanceEdit).omit('clearance_locked')
-    #grok.template('clearanceeditpage')
     label = 'Edit clearance data'
     title = 'Clearance Data'