Changeset 8039 for main/waeup.kofa/trunk/src/waeup/kofa/students

Timestamp:

4 Apr 2012, 11:25:41 (13 years ago)

Author:

Henrik Bettermann

Message:

Use ChangePasswordRequestPage? also for applicants.

Change password requests require a registration number.

Location:

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

Files:

• browser.py (modified) (2 diffs)
• browser_templates/sendpassword.pt (moved) (moved from main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/changepw.pt) (1 diff)
• tests/test_browser.py (modified) (1 diff)

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

@@ -1851 +1851 @@
     """
     grok.context(IUniversity)
-    grok.name('changepw')
+    grok.name('sendpw')
     grok.require('waeup.Anonymous')
-    grok.template('changepw')
-    label = _('Change my password')
+    grok.template('sendpassword')
+    label = _('Send me a new password')
     form_fields = grok.AutoFields(IStudentChangePassword)
 
@@ -1870 +1870 @@
             # No need to flash something.
             return
-        # Search student
-        cat = queryUtility(ICatalog, name='students_catalog')
+        # Search student or applicant
         reg_number = data['reg_number']
         email = data['email']
+        cat = queryUtility(ICatalog, name='students_catalog')
         results = cat.searchResults(
             reg_number=(reg_number, reg_number),
             email=(email,email))
         if len(results) == 0:
-            self.flash(_('No student record found.'))
+            # Try also the applicants_catalog if no student record was found.
+            cat = queryUtility(ICatalog, name='applicants_catalog')
+            if cat is None:
+                self.flash(_('Application package not installed.'))
+                return
+            results = cat.searchResults(
+                reg_number=(reg_number, reg_number),
+                email=(email,email))
+        if len(results) == 0:
+            self.flash(_('No record found.'))
             return
         student = list(results)[0]

main/waeup.kofa/trunk/src/waeup/kofa/students/browser_templates/sendpassword.pt

@@ -17 +17 @@
   </table>
 
+  <p i18n:translate="email_address_problem">
+    Enter the email address stored on Kofa.
+    You can't change your email address here.
+    If you've forgotten your email address or the email
+    address stored in Kofa is wrong or no longer valid,
+    use the enquiries form to request a change
+    of address.
+  </p>
+  <br />
   <div tal:condition="view/availableActions">
     <input tal:repeat="action view/actions"

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

@@ -1643 +1643 @@
 
     def test_change_password_request(self):
-        self.browser.open('http://localhost/app/changepw')
+        self.browser.open('http://localhost/app/sendpw')
         self.browser.getControl(name="form.reg_number").value = '123'
         self.browser.getControl(name="form.email").value = 'aa@aa.ng'