Changeset 7403

Timestamp:

20 Dec 2011, 09:26:14 (13 years ago)

Author:

Henrik Bettermann

Message:

Do the same in students.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/students/browser.py (modified) (1 diff)

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

@@ -385 +385 @@
     @grok.action('Send message now')
     def send(self, *args, **data):
-        fullname = self.request.principal.title
         try:
-            email_from = self.request.principal.email
+            email = self.request.principal.email
         except AttributeError:
-            email_from = self.config.email_admin
-        username = self.request.principal.id
-        usertype = self.request.principal.user_type.title()
-        body = data['body']
-        #subject = u'Mail from SIRP'
-        subject = data['subject']
-        email_to = self.context.email
+            email = self.config.email_admin
+        usertype = getattr(self.request.principal,
+                           'user_type', 'system').title()
         sirp_utils = getUtility(ISIRPUtils)
-        success = sirp_utils.sendMail(fullname,username,usertype,self.config.name,
-                  body,email_from,email_to,subject)
+        success = sirp_utils.sendMail(
+                self.request.principal.title,email,
+                self.context.display_fullname,self.context.email,
+                self.request.principal.id,usertype,
+                self.config.name,
+                data['body'],data['subject'])
         if success:
             self.flash('Your message has been sent.')