Contactus: Email format fix. SliceRequest: email message improved

diff --git a/portal/contactview.py b/portal/contactview.py
index 0b459a3..8272fe0 100644 (file)
--- a/portal/contactview.py
+++ b/portal/contactview.py
@@ -1,6 +1,7 @@
 from django.shortcuts           import render
-
+from django.template.loader      import render_to_string
 from django.views.generic       import View
+from django.core.mail           import send_mail
 
 from myslice.viewutils          import topmenu_items, the_user
 
@@ -27,9 +28,8 @@ class ContactView (View):
             if cc_myself:
                 recipients.append(email)
 
-            from django.core.mail import send_mail
-            send_mail("Onelab user %s submitted a query "%email, 
-                      [first_name,last_name,affiliation,subject,message], email, recipients)
+            msg = render_to_string('slice-request-email.txt', form.cleaned_data)
+            send_mail("Onelab user %s submitted a query "%email, msg, email, recipients)
             return render(request,'contact_sent.html') # Redirect after POST
         else:
             return self._display (request, form)

diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py
index 8d2104f..f92214e 100644 (file)
--- a/portal/slicerequestview.py
+++ b/portal/slicerequestview.py
@@ -55,7 +55,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView):
             if cc_myself:
                 recipients.append(email)
             msg = render_to_string('slice-request-email.txt', form.cleaned_data)
-            send_mail("Onelab New Slice request form submitted", msg, email, recipients)
+            send_mail("Onelab user %s requested a slice"%email , msg, email, recipients)
 
             return render(request,'slice-request-ack-view.html') # Redirect after POST
         else: