Changeset 8983 for main/waeup.kofa/trunk/src/waeup/kofa/students

Timestamp:

12 Jul 2012, 11:43:12 (13 years ago)

Author:

Henrik Bettermann

Message:

Add boolean field 'suspended' to IStudent and IApplicant and extend authentication (checkPassword) slightly. Test will follow

Location:

main/waeup.kofa/trunk/src/waeup/kofa/students

Files:

• authentication.py (modified) (2 diffs)
• browser.py (modified) (1 diff)
• interfaces.py (modified) (1 diff)
• tests/test_authentication.py (modified) (1 diff)
• tests/test_export.py (modified) (3 diffs)

main/waeup.kofa/trunk/src/waeup/kofa/students/authentication.py

@@ -102 +102 @@
     def checkPassword(self, password):
         """Check whether the given `password` matches the one stored.
+
+        We additionally check if student account has been suspended.
         """
         if not isinstance(password, basestring):
@@ -107 +109 @@
         if not getattr(self.context, 'password', None):
             # unset/empty passwords do never match
+            return False
+        if self.context.suspended == True:
             return False
         passwordmanager = getUtility(IPasswordManager, 'SSHA')

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

@@ -292 +292 @@
     grok.require('waeup.viewStudent')
     grok.template('basepage')
-    form_fields = grok.AutoFields(IStudentBase).omit('password')
+    form_fields = grok.AutoFields(IStudentBase).omit('password', 'suspended')
     pnav = 4
 
     @property
     def label(self):
-        return _('${a}: Base Data',
+        if self.context.suspended:
+            return _('${a}: Base Data (account suspended)',
+                mapping = {'a':self.context.display_fullname})
+        return  _('${a}: Base Data',
             mapping = {'a':self.context.display_fullname})
 

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

@@ -157 +157 @@
     is_postgrad = Attribute('True if postgraduate student')
 
+    suspended = schema.Bool(
+        title = _(u'Account suspended'),
+        default = False,
+        )
+
     student_id = schema.TextLine(
         title = _(u'Student Id'),

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_authentication.py

@@ -65 +65 @@
     email = None
     phone = None
+    suspended = False
 
 

main/waeup.kofa/trunk/src/waeup/kofa/students/tests/test_export.py

@@ -44 +44 @@
             'adm_code,clearance_locked,clr_code,date_of_birth,email,employer,'
             'firstname,lastname,matric_number,middlename,nationality,'
-            'perm_address,phone,reg_number,sex,student_id,password,'
+            'perm_address,phone,reg_number,sex,student_id,suspended,password,'
             'state,history,certcode\r\n'
 
             'my adm code,0,my clr code,1981-02-04#,anna@sample.com,,'
             'Anna,Tester,M123456,M.,NG,"Studentroad 21\nLagos 123456\n",'
-            '+234-123-12345#,123456,f,A111111,,created'
+            '+234-123-12345#,123456,f,A111111,0,,created'
             in result
             )
@@ -64 +64 @@
             'adm_code,clearance_locked,clr_code,date_of_birth,email,employer,'
             'firstname,lastname,matric_number,middlename,nationality,'
-            'perm_address,phone,reg_number,sex,student_id,password,'
+            'perm_address,phone,reg_number,sex,student_id,suspended,password,'
             'state,history,certcode\r\n'
 
             'my adm code,0,my clr code,1981-02-04#,anna@sample.com,,'
             'Anna,Tester,M123456,M.,NG,"Studentroad 21\nLagos 123456\n",'
-            '+234-123-12345#,123456,f,A111111,,created'
+            '+234-123-12345#,123456,f,A111111,0,,created'
             in result
             )
@@ -83 +83 @@
             'adm_code,clearance_locked,clr_code,date_of_birth,email,employer,'
             'firstname,lastname,matric_number,middlename,nationality,'
-            'perm_address,phone,reg_number,sex,student_id,password,'
+            'perm_address,phone,reg_number,sex,student_id,suspended,password,'
             'state,history,certcode\r\n'
 
             'my adm code,0,my clr code,1981-02-04#,anna@sample.com,,'
             'Anna,Tester,M123456,M.,NG,"Studentroad 21\nLagos 123456\n",'
-            '+234-123-12345#,123456,f,A111111,,created'
+            '+234-123-12345#,123456,f,A111111,0,,created'
             in result
             )