X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fcontactview.py;h=f1422fff06ef4fe31d8132b4b76f81bb32cf2737;hb=eb1e290439ad9dd7947766462d2138073d84c759;hp=0f2e40109ea53595f38926b0bed868ae27fb65fc;hpb=e662708d2f2f1ba05daefe1db50ee08c5439aadc;p=unfold.git

diff --git a/portal/contactview.py b/portal/contactview.py
index 0f2e4010..f1422fff 100644
--- a/portal/contactview.py
+++ b/portal/contactview.py
@@ -3,6 +3,7 @@ from django.template.loader     import render_to_string
 from django.views.generic       import View
 from django.core.mail           import send_mail
 
+from unfold.loginrequired       import FreeAccessView
 from ui.topmenu                 import topmenu_items, the_user
 
 from portal.forms               import ContactForm
@@ -10,16 +11,16 @@ 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']
+            description = form.cleaned_data['description']
             email = form.cleaned_data['email'] # email of the sender
             cc_myself = form.cleaned_data['cc_myself']
 
@@ -28,7 +29,7 @@ class ContactView (View):
             if cc_myself:
                 recipients.append(email)
 
-            msg = render_to_string('slice-request-email.txt', form.cleaned_data)
+            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:
@@ -40,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)
                 })