Changeset 7407

Timestamp:

20 Dec 2011, 11:05:07 (13 years ago)

Author:

Henrik Bettermann

Message:

Harmonize sendCredentials which can now be used for all kinds of users.

Location:

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

Files:

• applicants/browser.py (modified) (1 diff)
• students/browser.py (modified) (1 diff)
• utils/utils.py (modified) (3 diffs)

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

@@ -1064 +1064 @@
         # Send email with credentials
         login_url = self.url(grok.getSite(), 'login')
-        if sirp_utils.sendCredentials(applicant, password, login_url):
+        msg = 'You have successfully been registered for the'
+        if sirp_utils.sendCredentials(IUserAccount(applicant),
+            password, login_url, msg):
             self.redirect(self.url(self.context, 'registration_complete',
                                    data = dict(email=applicant.email)))

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

@@ -2234 +2234 @@
         IUserAccount(student).setPassword(pwd)
         # Send email with new redentials
-        username = student.student_id
-        fullname = student.display_fullname
-        subject = 'Your SIRP credentials'
         msg = 'You have successfully changed your password for the'
-        email_to = student.email
         login_url = self.url(grok.getSite(), 'login')
-        success = sirp_utils.sendPassword(fullname,msg,username,
-            pwd,login_url,email_to,subject)
+        success = sirp_utils.sendCredentials(
+            IUserAccount(student),pwd,login_url,msg)
         if success:
             self.flash('An email with your user name and password ' +
-                'has been sent to %s.' % email_to)
+                'has been sent to %s.' % email)
         else:
             self.flash('An smtp server error occurred.')

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

@@ -99 +99 @@
 
 
-    def sendCredentials(self, applicant, password, login_url):
+    def sendCredentials(self, user, password=None, login_url=None, msg=None):
         """Send credentials as email.
 
@@ -107 +107 @@
         Returns True or False to indicate successful operation.
         """
-        username = applicant.applicant_id
         subject = 'Your SIRP credentials'
-        msg = 'You have successfully been registered for the'
         text = """Dear %s,
 
@@ -130 +128 @@
         from_name = config.name_admin
         from_addr = config.email_admin
-        rcpt_name = applicant.display_fullname
-        rcpt_addr = applicant.email
+        rcpt_name = user.title
+        rcpt_addr = user.email
         body = text % (
-                rcpt_name, msg,config.name,username,password,login_url)
+                rcpt_name, msg,config.name,user.name,password,login_url)
         return send_mail(
             from_name,from_addr,rcpt_name,rcpt_addr,subject,body,config)