From 7cfe5d77641a0d785f3981a29870a08d211d181b Mon Sep 17 00:00:00 2001 From: Loic Baron Date: Mon, 27 Apr 2015 16:07:46 +0200 Subject: [PATCH] Emails: adding curent_site of the portal in the email sent to PIs --- portal/emailactivationview.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/portal/emailactivationview.py b/portal/emailactivationview.py index c54cdcbd..79f2c0ec 100644 --- a/portal/emailactivationview.py +++ b/portal/emailactivationview.py @@ -59,6 +59,10 @@ class ActivateEmailView(FreeAccessView, ThemeView): #page.add_js_files ( [ "js/jquery.validate.js", "js/my_account.register.js", "js/my_account.edit_profile.js" ] ) #page.add_css_files ( [ "css/onelab.css", "css/account_view.css","css/plugin.css" ] ) + # get the domain url + current_site = Site.objects.get_current() + current_site = current_site.domain + for key, value in kwargs.iteritems(): if key == "hash_code": hash_code=value @@ -99,15 +103,13 @@ class ActivateEmailView(FreeAccessView, ThemeView): u['email'] = pending_user.email u['user_hrn'] = pending_user.user_hrn u['pi'] = pending_user.pi + u['public_key'] = pending_user.public_key + u['current_site'] = current_site send_email_to_pis(self.request, u, 'user') else: activation = 'failed' - # get the domain url - current_site = Site.objects.get_current() - current_site = current_site.domain - context = super(ActivateEmailView, self).get_context_data(**kwargs) context['activation_status'] = activation @@ -121,10 +123,8 @@ class ActivateEmailView(FreeAccessView, ThemeView): #context['first_name'] = first_name #context['last_name'] = last_name #context['authority_hrn'] = authority_hrn - #context['public_key'] = public_key #context['email'] = email #context['user_hrn'] = user_hrn - #context['current_site'] = current_site context['theme'] = self.theme # context ['firstname'] = config['firstname'] prelude_env = page.prelude_env() -- 2.43.0