Changeset 7399 for main/waeup.sirp/trunk/src/waeup/sirp/applicants

Timestamp:

20 Dec 2011, 07:39:33 (13 years ago)

Author:

Henrik Bettermann

Message:

Define send_mail function and move sendCredentials code from browser.py to utils.py.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/applicants

Files:

• browser.py (modified) (2 diffs)
• browser_templates/applicantregemailsent.pt (modified) (2 diffs)

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

@@ -1059 +1059 @@
         self.applyData(applicant, **data)
         self.context.addApplicant(applicant)
-        password = getUtility(ISIRPUtils).genPassword()
+        sirp_utils = getUtility(ISIRPUtils)
+        password = sirp_utils.genPassword()
         IUserAccount(applicant).setPassword(password)
         # Send email with credentials
-        if self.sendCredentials(applicant, password):
+        login_url = self.url(grok.getSite(), 'login')
+        if sirp_utils.sendCredentials(applicant, password, login_url):
             self.redirect(self.url(self.context, 'registration_complete',
                                    data = dict(email=applicant.email)))
@@ -1069 +1071 @@
             self.flash('Email could not been sent. Please retry later.')
         return
-
-    def sendCredentials(self, applicant, password):
-        """Send credentials as email.
-
-        Input is the applicant for which credentials are sent and the
-        password.
-
-        Returns True or False to indicate successful operation.
-        """
-        sirp_utils = getUtility(ISIRPUtils)
-        username = applicant.applicant_id
-        fullname = applicant.display_fullname
-        subject = 'Your SIRP credentials'
-        msg = 'You have successfully been registered for the'
-        email_to = applicant.email
-        login_url = self.url(grok.getSite(), 'login')
-        success = sirp_utils.sendPassword(fullname,msg,username,
-            password,login_url,email_to,subject)
-        return success
 
 class ApplicantRegistrationEmailSent(SIRPPage):

main/waeup.sirp/trunk/src/waeup/sirp/applicants/browser_templates/applicantregemailsent.pt

@@ -6 +6 @@
   <p>
     An email with your user name and password
-    has been sent to <span tal:replace="view/email">user@foo.baz</span>
+    has been sent to <span tal:replace="view/email">user@foo.baz</span>.
   </p>
   <p>
@@ -12 +12 @@
   </p>
   <p>
-    Thanks for using SIRP.
+    Thanks for using SIRP!
+  </p>
 </div>