Changeset 13990 for main/waeup.kofa/trunk/src/waeup

Timestamp:

25 Jun 2016, 05:00:54 (8 years ago)

Author:

Henrik Bettermann

Message:

Use url method properly.

Location:

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

Files:

• browser.py (modified) (1 diff)
• mandate.py (modified) (1 diff)
• tests.py (modified) (4 diffs)

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

@@ -49 +49 @@
 
     def render(self):
-        self.flash(self.msg)
-        self.redirect(self.url(self.context, self.redirect_path))
+        if self.msg:
+            self.flash(self.msg, type='warning')
+        self.redirect(self.url(self.context) + self.redirect_path)
         return

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

@@ -78 +78 @@
             grok.getSite().logger.info(
                 'PasswordMandate used: %s ' % username)
-            redirect_path = 'login'
+            redirect_path = '/login'
         del self.__parent__[self.mandate_id]
         return msg, redirect_path

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

@@ -113 +113 @@
         self.assertEqual(msg,
             'Password has been successfully set. Login with your new password.')
-        self.assertEqual(redirect_path, 'login')
+        self.assertEqual(redirect_path, '/login')
         self.assertTrue(IUserAccount(student).checkPassword('mypwd1'))
         # All mandates have been removed.
@@ -133 +133 @@
         self.assertEqual(msg,
             'Password has been successfully set. Login with your new password.')
-        self.assertEqual(redirect_path, 'login')
+        self.assertEqual(redirect_path, '/login')
         self.assertTrue(IUserAccount(officer).checkPassword('mypwd1'))
         logfile = os.path.join(
@@ -151 +151 @@
         self.assertEqual(msg,
             'Password has been successfully set. Login with your new password.')
-        self.assertEqual(redirect_path, 'login')
+        self.assertEqual(redirect_path, '/login')
         self.assertTrue(IUserAccount(applicant).checkPassword('mypwd1'))
         logfile = os.path.join(
@@ -213 +213 @@
             % mandate.mandate_id)
         self.assertTrue('No mandate' in self.browser.contents)
-        self.assertEqual(self.browser.url, 'http://localhost/app/')
+        self.assertEqual(self.browser.url, 'http://localhost/app')
         # Mandate id is needed
         self.browser.open('http://localhost/app/mandate')
         self.assertTrue('Misuse' in self.browser.contents)
-        self.assertEqual(self.browser.url, 'http://localhost/app/')
+        self.assertEqual(self.browser.url, 'http://localhost/app')
 
     def test_refereereport_mandate(self):