Changeset 6704

Timestamp:

9 Sep 2011, 22:27:18 (13 years ago)

Author:

Henrik Bettermann

Message:

Add attribute to store admission checking access code in student object.

Be more verbose when setting password with access code.

Location:

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

Files:

• browser.py (modified) (4 diffs)
• interfaces.py (modified) (1 diff)
• student.py (modified) (1 diff)

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

@@ -156 +156 @@
         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 by applicant credentials
+        # 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)
@@ -170 +170 @@
             self.flash('More than one student found.')
             return
-        self.student_id = hitlist[0].student_id
-        student_pw = hitlist[0].context.password
-        if student_pw:
-            self.flash('Password has already been set. Please request a password reset.')
-            return
+        student = hitlist[0].context
+        self.student_id = student.student_id
+        student_pw = student.password
         pin = '%s-%s-%s' % (self.acprefix,self.acseries,self.acnumber)
         code = get_access_code(pin)
@@ -180 +178 @@
             self.flash('Access code is invalid.')
             return
+        if student_pw and pin == student.adm_code:
+            self.flash('Password has already been set. Your Student Id is %s'
+                % self.student_id)
+            return
+        elif student_pw:
+            self.flash('Password has already been set.')
+            return
         # Mark pin as used (this also fires a pin related transition)
         # and set student password
@@ -186 +191 @@
             return
         else:
-            comment = u"AC invalidated"
+            comment = u"AC invalidated for %s" % self.student_id
             # Here we know that the ac is in state initialized so we do not
             # expect an exception
             #import pdb; pdb.set_trace()
             invalidate_accesscode(pin,comment)
-            IUserAccount(hitlist[0].context).setPassword(self.acnumber)
+            IUserAccount(student).setPassword(self.acnumber)
+        self.flash('Password has been set. Your Student Id is %s'
+            % self.student_id)
         return
 

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

@@ -63 +63 @@
     #student_id = Attribute('Randomly generated id')
     password = Attribute('Encrypted password of a student')
+    adm_code = Attribute('Admission checking access code')
 
     def loggerInfo(ob_class, comment):

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

@@ -46 +46 @@
             self.student_id = u'Z654321'
         self.password = None
+        self.adm_code = None
         return