X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fcontactview.py;h=63b4bb0b16c3ddf0a9c12b0eff91e8585e7530c5;hb=fc6f6e5efd7b66a7e39a2d9f1f42c3ae5e0ca282;hp=8272fe0e6829352430d8bf497790ee68a35cb44e;hpb=4dfd873aec658a5f2a22983c7221f8b7006aa475;p=myslice.git

diff --git a/portal/contactview.py b/portal/contactview.py
index 8272fe0e..63b4bb0b 100644
--- a/portal/contactview.py
+++ b/portal/contactview.py
@@ -1,36 +1,43 @@
 from django.shortcuts           import render
-from django.template.loader      import render_to_string
+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
 
+from theme import ThemeView
+
 # 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, ThemeView):
     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']
 
             #recipients = authority_get_pi_emails(authority_hrn)
-            recipients = ['yasin.upmc@gmail.com', 'thierry.parmentelat@inria.fr', ]
+            recipients = ['support@myslice.info' ]
             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
+            if request.user.is_authenticated() :
+                username = request.user.email
+            else :
+                username = None
+            return render(request,'contact_sent.html', { 'theme' : self.theme,  'username': username}) # Redirect after POST
         else:
             return self._display (request, form)
 
@@ -38,8 +45,13 @@ class ContactView (View):
         return self._display (request, ContactForm()) # A fresh unbound form
         
     def _display (self, request, form):
+        if request.user.is_authenticated() :
+            username = request.user.email
+        else :
+            username = None
         return render(request, 'contact.html', {
                 'form': form,
-                'topmenu_items': topmenu_items('Contact Us', request),
-                'username': the_user (request)
+                'topmenu_items': topmenu_items('Contact', request),
+                'theme' : self.theme,
+                'username': username,
                 })