AiC and REST login

[myslice.git] / portal / contactview.py

diff --git a/portal/contactview.py b/portal/contactview.py
index 3da2e05..f3899a0 100644 (file)
--- a/portal/contactview.py
+++ b/portal/contactview.py
@@ -6,8 +6,14 @@ from unfold.loginrequired       import FreeAccessView
 from ui.topmenu                 import topmenu_items, the_user
 from django.core.mail           import EmailMultiAlternatives, send_mail
 from portal.forms               import ContactForm
+from manifold.core.query                import Query
+from manifoldapi.manifoldapi            import execute_query
+import json
 
 from myslice.theme import ThemeView
+
+import activity.user
+
 theme = ThemeView()
 
 # splitting the 2 functions done here
@@ -25,17 +31,18 @@ class ContactView (FreeAccessView, ThemeView):
             subject = form.cleaned_data['subject']
             description = form.cleaned_data['description']
             email = form.cleaned_data['email'] # email of the sender
-            cc_myself = form.cleaned_data['cc_myself']
+            #cc_myself = form.cleaned_data['cc_myself']
 
             #try:
                 # Send an email: the support recipients
-            #theme.template_name = 'email_support.txt'
-            #recipients = render_to_string(theme.template, form.cleaned_data)
-            #recipients = subject.replace('\n', '')
-            recipients = ['support@myslice.info','contact@fed4fire.eu']
-            if cc_myself:
-                recipients.append(email)
-            #recipients = ['support@myslice.info']
+            theme.template_name = 'email_default_recipients.txt'
+            recipients = render_to_string(theme.template, form.cleaned_data)
+            recipients = recipients.replace('\n', '')
+            #recipients = ['support@onelab.eu']
+            ## removed it cz recipients is not a list so append doesn't work ###
+            ## we don't need it cz the new ticketing systems sends a confirmation email ###
+            #if cc_myself:
+            #    recipients.append(email)
             theme.template_name = 'contact_support_email.html'
             html_content = render_to_string(theme.template, form.cleaned_data)
         
@@ -53,7 +60,7 @@ class ContactView (FreeAccessView, ThemeView):
             #    else:
             sender = email
         
-            msg = EmailMultiAlternatives(subject, text_content, sender, recipients)
+            msg = EmailMultiAlternatives(subject, text_content, sender, [recipients])
             msg.attach_alternative(html_content, "text/html")
             msg.send()
             #except Exception, e:
@@ -63,7 +70,9 @@ class ContactView (FreeAccessView, ThemeView):
                 username = request.user.email
             else :
                 username = None
-            return render(request,'contact_sent.html', { 'theme' : self.theme,  'username': username}) # Redirect after POST
+            # log user activity
+            activity.user.contact(self.request)
+            return render(request,'contact_sent.html', { 'theme' : self.theme,  'username': username, 'request':request}) # Redirect after POST
         else:
             return self._display (request, form)
 
@@ -71,14 +80,16 @@ class ContactView (FreeAccessView, ThemeView):
         return self._display (request, ContactForm()) # A fresh unbound form
         
     def _display (self, request, form):
-        if request.user.is_authenticated() :
+        if request.user.is_authenticated():
             username = request.user.email
         else :
             username = None
+            pi = "is_not_pi"
         return render(request, self.template, {
                 'form': form,
                 'topmenu_items': topmenu_items('Contact', request),
                 'theme' : self.theme,
                 'username': username,
-                'section': "Contact"
+                'section': "Contact",
+                'request': request,
                 })