X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fcontactview.py;h=796c8b049125ea485b7759dad2f446d8231a5833;hb=9d9c9d79c1bb1b54d1c402a7f4c0b895e294e5ef;hp=44357f2d506f3679d9bd1d632f816f56b81a02e2;hpb=00ccef62a48c74fabda3b047fd78a7411e73f691;p=myslice.git

diff --git a/portal/contactview.py b/portal/contactview.py
index 44357f2d..796c8b04 100644
--- a/portal/contactview.py
+++ b/portal/contactview.py
@@ -1,15 +1,18 @@
 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
 
-# view for contact form
-class ContactView (View):
-  def dispatch(self, request):
-    if request.method == 'POST': # If the form has been submitted...
+# 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 (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
@@ -26,16 +29,18 @@ 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('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:
-        form = ContactForm() # An unbound form
-    
-    return render(request, 'contact.html', {
-        'form': form,
-        'topmenu_items': topmenu_items('Contact Us', request),
-        'username': the_user (request)
-
-    })
-
+        else:
+            return self._display (request, form)
+
+    def get (self, request):
+        return self._display (request, ContactForm()) # A fresh unbound form
+        
+    def _display (self, request, form):
+        return render(request, 'contact.html', {
+                'form': form,
+                'topmenu_items': topmenu_items('Contact', request),
+                'username': the_user (request)
+                })