Changeset 8853 for main

Timestamp:

29 Jun 2012, 17:28:06 (13 years ago)

Author:

Henrik Bettermann

Message:

StudentRequestPasswordPage?: Create mandate and send link by email instead of setting password directly.

Show link to StudentRequestPasswordPage? on login page.

Location:

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

Files:

• applicants/browser.py (modified) (1 diff)
• browser/pages.py (modified) (1 diff)
• browser/templates/loginpage.pt (modified) (1 diff)
• interfaces.py (modified) (1 diff)
• mandates/mandate.py (modified) (1 diff)
• mandates/tests.py (modified) (2 diffs)
• students/browser.py (modified) (2 diffs)
• utils/utils.py (modified) (3 diffs)

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

@@ -1083 +1083 @@
         # Send email with credentials
         login_url = self.url(grok.getSite(), 'login')
+        url_info = u'Login: %s' % login_url
         msg = _('You have successfully been registered for the')
         if kofa_utils.sendCredentials(IUserAccount(applicant),
-            password, login_url, msg):
+            password, url_info, msg):
             email_sent = applicant.email
         else:

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

@@ -2129 +2129 @@
         msg = _('You have successfully changed your password for the')
         login_url = self.url(grok.getSite(), 'login')
+        url_info = u'Login: %s' % login_url
         success = kofa_utils.sendCredentials(
-            IUserAccount(user),pwd,login_url,msg)
+            IUserAccount(user),pwd,url_info,msg)
         if success:
             self.flash(_('An email with your user name and password ' +

main/waeup.kofa/trunk/src/waeup/kofa/browser/templates/loginpage.pt

@@ -37 +37 @@
     If you are having trouble logging in, make sure to enable  cookies in your web browser.
   </p>
-  <p i18n:translate="login_trouble2">
+  <p i18n:translate="login_trouble2" tal:condition="python:False">
     You don't have an account because you are a fresh student, or your student record has just been created?
-    Acquire a Password Access Code (PWD) and inititialize your student account
-    <strong><a href  ="setpassword"> here</a></strong>.
+    Acquire a Password Activation Code (PWD) and inititialize your student account
+    <strong><a href ="setpassword"> here</a></strong>.
+  </p>
+  <p i18n:translate="login_trouble4">
+    You don't have an account because you are a fresh student, or your student record has just been created?
+    Inititialize your student account <strong><a href="requestpw"> here</a></strong>.
   </p>
   <p i18n:translate="login_trouble3"> Or simply forgot your student id, application id or password? Then request a new password

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

@@ -234 +234 @@
         """
 
-    def sendCredentials(user, password, login_url, msg):
+    def sendCredentials(user, password, url_info, msg):
         """Send credentials as email.
 

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

@@ -68 +68 @@
             msg = _('Mandate expired.')
         if self._setStudentPassword():
-            msg = _('Password has been successfully set.')
+            msg = _('Password has been successfully set. '
+                    'Proceed to the login page and enter your credentials.')
         del self.__parent__[self.mandate_id]
         return msg

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

@@ -104 +104 @@
         msg = mandate.execute()
         # Password has been set.
-        self.assertEqual(msg, u'Password has been successfully set.')
+        self.assertEqual(msg, 'Password has been successfully set. Proceed to '
+            'the login page and enter your credentials.')
         self.assertTrue(IUserAccount(student).checkPassword('mypwd1'))
         # All mandates have been removed.
@@ -132 +133 @@
             % mandate.mandate_id)
         # Password has been set.
-        self.assertTrue('Password has been successfully set.'
+        self.assertTrue('Password has been successfully set. Proceed to '
+                        'the login page and enter your credentials.'
             in self.browser.contents)
         self.assertTrue(IUserAccount(student).checkPassword('mypwd1'))

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

@@ -64 +64 @@
 from waeup.kofa.hostels.hostel import NOT_OCCUPIED
 from waeup.kofa.utils.helpers import get_current_principal, to_timezone
+from waeup.kofa.mandates.mandate import StudentPasswordMandate
 
 grok.context(IKofaObject) # Make IKofaObject the default context
@@ -1983 +1984 @@
         kofa_utils = getUtility(IKofaUtils)
         password = kofa_utils.genPassword()
-        IUserAccount(student).setPassword(password)
+        mandate = StudentPasswordMandate()
+        mandate.params['password'] = password
+        mandate.params['student_id'] = student.student_id
+        site = grok.getSite()
+        site['mandates'].addMandate(mandate)
         # Send email with credentials
-        login_url = self.url(grok.getSite(), 'login')
+        args = {'mandate_id':mandate.mandate_id}
+        mandate_url = self.url(site) + '/mandate?%s' % urlencode(args)
+        url_info = u'Confirmation link: %s' % mandate_url
         msg = _('You have successfully requested a password for the')
         if kofa_utils.sendCredentials(IUserAccount(student),
-            password, login_url, msg):
+            password, url_info, msg):
             email_sent = student.email
         else:

main/waeup.kofa/trunk/src/waeup/kofa/utils/utils.py

@@ -192 +192 @@
 
 
-    def sendCredentials(self, user, password=None, login_url=None, msg=None):
+    def sendCredentials(self, user, password=None, url_info=None, msg=None):
         """Send credentials as email.
 
@@ -209 +209 @@
 Your user name: ${d}
 Your password: ${e}
-Login page: ${f}
+${f}
 
 Please remember your user name and keep
@@ -230 +230 @@
             'd':user.name,
             'e':password,
-            'f':login_url})
+            'f':url_info})
 
         body = translate(text, 'waeup.kofa',