X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Factions.py;h=3479c02b09fef82c0f23f9a5c8bd25d3ef0639f4;hb=a2d77e198ac3df2e91b8d75c631432b4beecb23b;hp=baf4ccab8ee96c8bd7cb05dc2d66cc7947798454;hpb=885696a24d5fdf736607ff9887af49703dc49520;p=unfold.git diff --git a/portal/actions.py b/portal/actions.py index baf4ccab..3479c02b 100644 --- a/portal/actions.py +++ b/portal/actions.py @@ -252,7 +252,7 @@ def get_request_by_id(ids): 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() @@ -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() @@ -538,7 +538,7 @@ def create_pending_user(wsgi_request, request, user_detail): 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', )