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', '')
def get_requests(authority_hrns=None):
print "get_request_by_authority auth_hrns = ", authority_hrns
if not authority_hrns:
- ## get those pending users who have validated their emails
+ ## get those pending users who have confirmed their emails
pending_users = PendingUser.objects.filter(status__iexact = 'True')
pending_slices = PendingSlice.objects.all()
pending_authorities = PendingAuthority.objects.all()
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()
public_key = request['public_key'],
private_key = request['private_key'],
user_hrn = request['user_hrn'],
- pi = '', # XXX Why not None ?
+ pi = request['pi'],
email_hash = request['email_hash'],
status = 'False',
)
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'])
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)