X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Factions.py;h=e21812608a2ea7fcb7c7dcd46a53e6df78d0b411;hb=606581446b8e61b0817aefa81cbcc64df9cb21ed;hp=648ae57b7a9843fc6edd84acfc0e2272b622bb99;hpb=fa4df7808ac2e3eb7a60734d72377aacfb694fd5;p=unfold.git

diff --git a/portal/actions.py b/portal/actions.py
index 648ae57b..e2181260 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', '')
@@ -402,7 +402,7 @@ def create_pending_slice(wsgi_request, request, email):
         slice_name      = request['slice_name'],
         user_hrn        = request['user_hrn'],
         authority_hrn   = request['authority_hrn'],
-        number_of_nodes = request['number_of_nodes'],
+        number_of_nodes = request['exp_url'],
         purpose         = request['purpose'],
     )
     s.save()
@@ -551,7 +551,10 @@ def create_pending_user(wsgi_request, request, user_detail):
     theme.template_name = 'activate_user_email_subject.txt'
     subject = render_to_string(theme.template, request)
     subject = subject.replace('\n', '')
-    sender = 'support@myslice.info'
+    #sender = 'support@myslice.info'
+    theme.template_name = 'email_default_sender.txt'
+    sender =  render_to_string(theme.template, request)
+    sender = sender.replace('\n', '')
     recipient = [request['email']]
     #recipient = recipient.append(request['email'])
 
@@ -605,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)