X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fcontactview.py;h=918385f56c70e81b5ae0de47b1d3512a468f2baf;hb=dc0c3cef4b19067ee34234f295d8e96649add6f5;hp=de6a31781b16e39aa7075bb43312d278866f3ca4;hpb=66846b948b78e03a36bc88a26441ec78f7ad92c2;p=myslice.git

diff --git a/portal/contactview.py b/portal/contactview.py
index de6a3178..918385f5 100644
--- a/portal/contactview.py
+++ b/portal/contactview.py
@@ -1,22 +1,24 @@
 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
+from unfold.loginrequired       import FreeAccessView
+from ui.topmenu                 import topmenu_items, the_user
 
 from portal.forms               import ContactForm
 
 # splitting the 2 functions done here
 # GET is for displaying the empty form
 # POST is to process it once filled - or show the form again if anything is missing
-class ContactView (View):
+class ContactView (FreeAccessView):
     def post (self, request):
         form = ContactForm(request.POST) # A form bound to the POST data
         if form.is_valid(): # All validation rules pass
             # Process the data in form.cleaned_data
             first_name = form.cleaned_data['first_name']
             last_name = form.cleaned_data['last_name']
-            affiliation = form.cleaned_data['affiliation']
+            authority = form.cleaned_data['authority']
             subject = form.cleaned_data['subject']
             message = form.cleaned_data['message']
             email = form.cleaned_data['email'] # email of the sender
@@ -27,8 +29,8 @@ class ContactView (View):
             if cc_myself:
                 recipients.append(email)
 
-            from django.core.mail import send_mail
-            send_mail("Onelab user submitted a query ", [first_name,last_name,affiliation,subject,message], email, recipients)
+            msg = render_to_string('contact-support-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)
@@ -39,6 +41,6 @@ class ContactView (View):
     def _display (self, request, form):
         return render(request, 'contact.html', {
                 'form': form,
-                'topmenu_items': topmenu_items('Contact Us', request),
+                'topmenu_items': topmenu_items('Contact', request),
                 'username': the_user (request)
                 })