Changeset 9123

Timestamp:

30 Aug 2012, 06:08:34 (12 years ago)

Author:

Henrik Bettermann

Message:

Display appropriate flash message if credentials are correct
but student has been deactivated/suspended.

Location:

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

Files:

• browser/pages.py (modified) (2 diffs)
• students/tests/test_browser.py (modified) (2 diffs)

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

@@ -40 +40 @@
     IPrincipalRoleManager, IPrincipalRoleMap)
 from zope.session.interfaces import ISession
+from zope.password.interfaces import IPasswordManager
 from waeup.kofa.browser import (
     KofaPage, KofaForm, KofaEditFormPage, KofaAddFormPage,
@@ -206 +207 @@
                 self.redirect(self.camefrom)
                 return
+            # Display appropriate flash message if credentials are correct
+            # but student has been deactivated.
+            login = self.request.form['form.login']
+            if len(login) == 8 and grok.getSite()['students'].has_key(login):
+                student = grok.getSite()['students'][
+                    self.request.form['form.login']]
+                password = self.request.form['form.password']
+                passwordmanager = getUtility(IPasswordManager, 'SSHA')
+                if passwordmanager.checkPassword(student.password, password):
+                    self.flash(_('Your account has been deactivated.'))
+                    return
             self.flash(_('You entered invalid credentials.'))
 

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

@@ -1163 +1163 @@
         # and can perform actions
         IWorkflowInfo(self.student).fireTransition('admit')
-        # Students can't login if their account is suspended
+        # Students can't login if their account is suspended/deactivated
         self.student.suspended = True
         self.browser.open(self.login_path)
@@ -1170 +1170 @@
         self.browser.getControl("Login").click()
         self.assertTrue(
-            'You entered invalid credentials.' in self.browser.contents)
+            'Your account has been deactivated.' in self.browser.contents)
         self.student.suspended = False
         self.browser.getControl("Login").click()