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,
'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,
'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)
-<img src="https://onelab.eu/templates/onelab2/images/logo.png">
+<img src="{{ STATIC_URL }}img/onelab.png">
<br>
<h1>NEW AUTHORITY REQUEST</h1>
<br>
+<p>This email is only for OneLab admins</p>
+<br>
<h2>{{site_name}}</h2>
-<b>Authority hrn :</b> {{authority_hrn}}
-<b>Abreviated name :</b> {{site_abbreviated_name}}
-<b>URL :</b> {{site_url}}
-<b>latitude :</b> {{site_latitude}}
-<b>longitude :</b> {{site_longitude}}
-<b>Address :</b> {{address_line1}}<br>
- {{address_line2}}<br>
- {{address_line3}}<br>
-<b>City :</b> {{address_city}}
-<b>Postcode :</b> {{address_postalcode}}
-<b>State :</b> {{address_state}}
-<b>Country :</b> {{address_country}}
+<b>Authority hrn :</b> {{authority_hrn}}<br>
+<b>Abreviated name :</b> {{site_abbreviated_name}}<br>
+<b>URL :</b> {{site_url}}<br>
+<b>City :</b> {{address_city}}<br>
+<b>Postcode :</b> {{address_postalcode}}<br>
+<b>State :</b> {{address_state}}<br>
+<b>Country :</b> {{address_country}}<br>
<br><br>
<h2>PI for this Authority</h2>
-<b>First Name :</b> {{first_name}}
-<b>Last Name :</b> {{last_name}}
-<b>Authority hrn:</b> {{authority_hrn}}
-<b>Public key :</b> {{public_key}}
-<b>Email :</b> {{email}}
-<b>User Hrn :</b> {{user_hrn}}
+<b>First Name :</b> {{first_name}}<br>
+<b>Last Name :</b> {{last_name}}<br>
+<b>Authority hrn:</b> {{authority_hrn}}<br>
+<b>Public key :</b> {{public_key}}<br>
+<b>Email :</b> {{email}}<br>
+<b>User Hrn :</b> {{user_hrn}}<br>