From: Yasin Date: Mon, 7 Jul 2014 15:59:34 +0000 (+0200) Subject: fix: get_pi none or empty check X-Git-Tag: myslice-1.1~47^2~1 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=d2b0b7b98fb14324e8b1d527b7db7829c4cdfa91;p=unfold.git fix: get_pi none or empty check --- diff --git a/portal/actions.py b/portal/actions.py index e68bd3f4..baf4ccab 100644 --- a/portal/actions.py +++ b/portal/actions.py @@ -36,7 +36,7 @@ def authority_get_pi_emails(request, authority_hrn): pi_users = authority_get_pis(request,authority_hrn) print "pi_users = %s" % pi_users - if any(d['pi_users'] == None for d in pi_users): + if any(pi['pi_users'] == None or not pi['pi_users'] for pi in pi_users): #theme.template_name = 'email_default_recipients.txt' #default_email = render_to_string(theme.template, request) #default_email = default_email.replace('\n', '') @@ -608,7 +608,7 @@ def create_pending_user(wsgi_request, request, user_detail): theme.template_name = 'user_request_email.html' html_content = render_to_string(theme.template, request) - + theme.template_name = 'user_request_email.txt' text_content = render_to_string(theme.template, request) diff --git a/portal/templates/email_default_sender.txt b/portal/templates/email_default_sender.txt index fb49ee96..c0f206f3 100644 --- a/portal/templates/email_default_sender.txt +++ b/portal/templates/email_default_sender.txt @@ -1 +1 @@ -support@myslice.info +support@onelab.eu