From 22817efbae41e9d59f07f1e61f3d5f05f1193897 Mon Sep 17 00:00:00 2001 From: Yasin Date: Fri, 29 Aug 2014 17:44:06 +0200 Subject: [PATCH] add authority email: bug fix. email working now --- portal/joinview.py | 43 ++++++++----------- portal/templates/authority_request_email.html | 35 +++++++-------- portal/templates/authority_request_email.txt | 9 +--- 3 files changed, 36 insertions(+), 51 deletions(-) diff --git a/portal/joinview.py b/portal/joinview.py index 832055bd..0282e962 100644 --- a/portal/joinview.py +++ b/portal/joinview.py @@ -141,7 +141,7 @@ class JoinView (FreeAccessView, ThemeView): site_url = reg_site_url, site_latitude = reg_site_latitude, site_longitude = reg_site_longitude, - address_line1 = reg_address_line1, + address_line1 = reg_email, # XXX field name must be renamed. Email needed 4 rejection email. address_line2 = reg_address_line2, address_line3 = reg_address_line3, address_city = reg_address_city, @@ -197,14 +197,7 @@ class JoinView (FreeAccessView, ThemeView): 'authority_hrn' : reg_root_authority_hrn + '.' + reg_site_authority, 'site_abbreviated_name' : reg_site_abbreviated_name, 'site_url' : reg_site_url, - 'site_latitude' : reg_site_latitude, - 'site_longitude' : reg_site_longitude, - 'address_line1' : reg_address_line1, - 'address_line2' : reg_address_line2, - 'address_line3' : reg_address_line3, 'address_city' : reg_address_city, - 'address_postalcode' : reg_address_postalcode, - 'address_state' : reg_address_state, 'address_country' : reg_address_country, 'first_name' : reg_fname, 'last_name' : reg_lname, @@ -213,33 +206,33 @@ class JoinView (FreeAccessView, ThemeView): 'user_hrn' : user_hrn, 'public_key' : public_key, } - recipients = authority_get_pi_emails(request,reg_auth) + + #recipients = authority_get_pi_emails(request,reg_auth) - # We don't need to send this email to user. - # it's for the PI only - #if ctx['cc_myself']: - # recipients.append(ctx['email']) - theme.template_name = 'authority_request_email.html' - html_content = render_to_string(theme.template, ctx) + self.template_name = 'authority_request_email.html' + html_content = render_to_string(self.template, ctx) - theme.template_name = 'authority_request_email.txt' - text_content = render_to_string(theme.template, ctx) + self.template_name = 'authority_request_email.txt' + text_content = render_to_string(self.template, ctx) - theme.template_name = 'authority_request_email_subject.txt' - subject = render_to_string(theme.template, ctx) + self.template_name = 'authority_request_email_subject.txt' + subject = render_to_string(self.template, ctx) subject = subject.replace('\n', '') - theme.template_name = 'email_default_sender.txt' - sender = render_to_string(theme.template, ctx) - sender = sender.replace('\n', '') - - msg = EmailMultiAlternatives(subject, text_content, sender, recipients) + #theme.template_name = 'email_default_sender.txt' + #sender = render_to_string(theme.template, ctx) + #sender = sender.replace('\n', '') + sender = reg_email + + msg = EmailMultiAlternatives(subject, text_content, sender, ['support@onelab.eu']) msg.attach_alternative(html_content, "text/html") msg.send() except Exception, e: print "Failed to send email, please check the mail templates and the SMTP configuration of your server" - + import traceback + traceback.print_exc() + self.template_name = 'join_complete.html' # log institution activity activity.institution.joined(self.request) diff --git a/portal/templates/authority_request_email.html b/portal/templates/authority_request_email.html index 51b7c401..bdcd065f 100644 --- a/portal/templates/authority_request_email.html +++ b/portal/templates/authority_request_email.html @@ -1,27 +1,24 @@ - +

NEW AUTHORITY REQUEST


+

This email is only for OneLab admins

+

{{site_name}}

-Authority hrn : {{authority_hrn}} -Abreviated name : {{site_abbreviated_name}} -URL : {{site_url}} -latitude : {{site_latitude}} -longitude : {{site_longitude}} -Address : {{address_line1}}
- {{address_line2}}
- {{address_line3}}
-City : {{address_city}} -Postcode : {{address_postalcode}} -State : {{address_state}} -Country : {{address_country}} +Authority hrn : {{authority_hrn}}
+Abreviated name : {{site_abbreviated_name}}
+URL : {{site_url}}
+City : {{address_city}}
+Postcode : {{address_postalcode}}
+State : {{address_state}}
+Country : {{address_country}}


PI for this Authority

-First Name : {{first_name}} -Last Name : {{last_name}} -Authority hrn: {{authority_hrn}} -Public key : {{public_key}} -Email : {{email}} -User Hrn : {{user_hrn}} +First Name : {{first_name}}
+Last Name : {{last_name}}
+Authority hrn: {{authority_hrn}}
+Public key : {{public_key}}
+Email : {{email}}
+User Hrn : {{user_hrn}}
diff --git a/portal/templates/authority_request_email.txt b/portal/templates/authority_request_email.txt index 25eb21b5..9376a652 100644 --- a/portal/templates/authority_request_email.txt +++ b/portal/templates/authority_request_email.txt @@ -1,3 +1,5 @@ +This email is only for OneLab admins. + NEW AUTHORITY REQUEST Site : {{site_name}} @@ -6,15 +8,8 @@ Authority hrn : {{authority_hrn}} Abreviated name : {{site_abbreviated_name}} URL : {{site_url}} -latitude : {{site_latitude}} -longitude : {{site_longitude}} -Address : {{address_line1}} - {{address_line2}} - {{address_line3}} City : {{address_city}} -Postcode : {{address_postalcode}} -State : {{address_state}} Country : {{address_country}} -- 2.43.0