Changeset 11680 for main

Timestamp:

6 Jun 2014, 08:55:12 (10 years ago)

Author:

Henrik Bettermann

Message:

Redirect to login page after using password mandate.

Location:

main/waeup.kofa/trunk

Files:

• CHANGES.txt (modified) (1 diff)
• src/waeup/kofa/mandates/browser.py (modified) (1 diff)
• src/waeup/kofa/mandates/mandate.py (modified) (1 diff)
• src/waeup/kofa/mandates/tests.py (modified) (4 diffs)

main/waeup.kofa/trunk/CHANGES.txt

@@ -4 +4 @@
 1.2dev (unreleased)
 ===================
+
+* Redirect to login page after using password mandate.
 
 * Adding student payment tickets is logged.

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

@@ -43 +43 @@
         msg = mandate.execute()
         self.flash(msg)
-        self.redirect(self.url(self.context))
         return
 
     def render(self):
-        self.redirect(self.url(self.context))
+        self.redirect(self.url(self.context, 'login'))
         return

main/waeup.kofa/trunk/src/waeup/kofa/mandates/mandate.py

@@ -70 +70 @@
             msg = _('Mandate expired.')
         if self._setPassword():
-            msg = _('Password has been successfully set. '
-                    'Proceed to the login page and enter your credentials.')
+            msg = _('Password has been successfully set.')
             username = IUserAccount(self.params['user']).name
             grok.getSite().logger.info(

main/waeup.kofa/trunk/src/waeup/kofa/mandates/tests.py

@@ -104 +104 @@
         msg = mandate.execute()
         # Password has been set.
-        self.assertEqual(msg, 'Password has been successfully set. Proceed to '
-            'the login page and enter your credentials.')
+        self.assertEqual(msg, 'Password has been successfully set.')
         self.assertTrue(IUserAccount(student).checkPassword('mypwd1'))
         # All mandates have been removed.
@@ -123 +122 @@
         msg = mandate.execute()
         # Password has been set.
-        self.assertEqual(msg, 'Password has been successfully set. Proceed to '
-            'the login page and enter your credentials.')
+        self.assertEqual(msg, 'Password has been successfully set.')
         self.assertTrue(IUserAccount(officer).checkPassword('mypwd1'))
         logfile = os.path.join(
@@ -140 +138 @@
         msg = mandate.execute()
         # Password has been set.
-        self.assertEqual(msg, 'Password has been successfully set. Proceed to '
-            'the login page and enter your credentials.')
+        self.assertEqual(msg, 'Password has been successfully set.')
         self.assertTrue(IUserAccount(applicant).checkPassword('mypwd1'))
         logfile = os.path.join(
@@ -172 +169 @@
             % mandate.mandate_id)
         # Password has been set.
-        self.assertTrue('Password has been successfully set. Proceed to '
-                        'the login page and enter your credentials.'
+        self.assertTrue('Password has been successfully set.'
             in self.browser.contents)
         self.assertTrue(IUserAccount(student).checkPassword('mypwd1'))
         # All mandates have been removed.
         self.assertEqual(len(self.app['mandates'].keys()), 0)
+        # We redirect to login page not to the frontpage.
+        self.assertEqual(self.browser.url, 'http://localhost/app/login')