git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Registration and Join for Authority using Manifold query and the corresponding Metada...
[myslice.git]
/
portal
/
actions.py
diff --git
a/portal/actions.py
b/portal/actions.py
index
e68bd3f
..
3a5fcbc
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
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', '')
#theme.template_name = 'email_default_recipients.txt'
#default_email = render_to_string(theme.template, request)
#default_email = default_email.replace('\n', '')
@@
-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:
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
validat
ed their emails
+ ## get those pending users who have
confirm
ed their emails
pending_users = PendingUser.objects.filter(status__iexact = 'True')
pending_slices = PendingSlice.objects.all()
pending_authorities = PendingAuthority.objects.all()
pending_users = PendingUser.objects.filter(status__iexact = 'True')
pending_slices = PendingSlice.objects.all()
pending_authorities = PendingAuthority.objects.all()
@@
-321,13
+321,14
@@
def portal_validate_request(wsgi_request, request_ids):
# XXX tmp sfa dependency
from sfa.util.xrn import Xrn
urn = Xrn(hrn, request['type']).get_urn()
# XXX tmp sfa dependency
from sfa.util.xrn import Xrn
urn = Xrn(hrn, request['type']).get_urn()
-
+
+ # Only hrn is required for Manifold Query
sfa_authority_params = {
sfa_authority_params = {
- 'hrn' : hrn,
-
'
urn' : urn,
- 'type' : request['type'],
+ '
authority_
hrn' : hrn,
+
#'authority_
urn' : urn,
+
#
'type' : request['type'],
#'pi' : None,
#'pi' : None,
- 'enabled' : True
+
#
'enabled' : True
}
print "ADD Authority"
sfa_add_authority(wsgi_request, sfa_authority_params)
}
print "ADD Authority"
sfa_add_authority(wsgi_request, sfa_authority_params)
@@
-402,7
+403,7
@@
def create_pending_slice(wsgi_request, request, email):
slice_name = request['slice_name'],
user_hrn = request['user_hrn'],
authority_hrn = request['authority_hrn'],
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()
purpose = request['purpose'],
)
s.save()
@@
-538,7
+539,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'],
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',
)
email_hash = request['email_hash'],
status = 'False',
)
@@
-608,7
+609,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.html'
html_content = render_to_string(theme.template, request)
-
+
theme.template_name = 'user_request_email.txt'
text_content = render_to_string(theme.template, request)
theme.template_name = 'user_request_email.txt'
text_content = render_to_string(theme.template, request)