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
e218126
..
3a5fcbc
100644
(file)
--- 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:
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)
@@
-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',
)