X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=portal%2Fcontactview.py;h=b076cd98dab4c536c23dc123d7a1d1638fe8f27d;hb=ff2d326c9f0ef02fd70e3b0c312d6ec5c5af0ca4;hp=c985b297b133daee92579a7ddf12f2693d683616;hpb=3d80b8c60c3f3ecad72c8280cc3a7be11b62e3c7;p=myslice.git

diff --git a/portal/contactview.py b/portal/contactview.py
index c985b297..b076cd98 100644
--- a/portal/contactview.py
+++ b/portal/contactview.py
@@ -28,16 +28,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)
+            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)
             #recipients = ['support@myslice.info']
             theme.template_name = 'contact_support_email.html'
             html_content = render_to_string(theme.template, form.cleaned_data)
@@ -56,7 +58,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:
@@ -89,7 +91,7 @@ class ContactView (FreeAccessView, ThemeView):
                             if 'myslice' in platform_detail['platform']:
                                 acc_auth_cred = account_config.get('delegated_authority_credentials','N/A')
             # assigning values
-            if acc_auth_cred == {}:
+            if acc_auth_cred == {} or acc_auth_cred == 'N/A':
                 pi = "is_not_pi"
             else:
                 pi = "is_pi"