Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

diff --git a/portal/actions.py b/portal/actions.py
index e68bd3f..baf4cca 100644 (file)
--- 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 fb49ee9..c0f206f 100644 (file)
--- a/portal/templates/email_default_sender.txt
+++ b/portal/templates/email_default_sender.txt
@@ -1 +1 @@
-support@myslice.info
+support@onelab.eu