Changeset 9705

Timestamp:

21 Nov 2012, 20:54:11 (12 years ago)

Author:

Henrik Bettermann

Message:

If suspended_comment is set this message will be flashed instead.

Location:

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

Files:

• browser/pages.py (modified) (1 diff)
• students/tests/test_browser.py (modified) (1 diff)

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

@@ -259 +259 @@
                         return
                     # Now we know that the student is suspended.
-                    self.flash(_('Your account has been deactivated.'))
+                    comment = getattr(student, 'suspended_comment', None)
+                    if comment:
+                        self.flash(comment)
+                    else:
+                        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

@@ -1790 +1790 @@
         self.browser.getControl("Login").click()
         self.assertMatches(
-            '...Your account has been deactivated...', self.browser.contents)
+            '...<div class="alert-message warning">'
+            'Your account has been deactivated.</div>...', self.browser.contents)
+        # If suspended_comment is set this message will be flashed instead
+        self.student.suspended_comment = u'Aetsch baetsch!'
+        self.browser.getControl(name="form.login").value = self.student_id
+        self.browser.getControl(name="form.password").value = 'spwd'
+        self.browser.getControl("Login").click()
+        self.assertMatches(
+            '...<div class="alert-message warning">Aetsch baetsch!</div>...',
+            self.browser.contents)
         self.student.suspended = False
         # Students can't login if a temporary password has been set and