from unfold.page import Page
from unfold.loginrequired import FreeAccessView
-from ui.topmenu import topmenu_items
+from ui.topmenu import topmenu_items_live
from manifold.manifoldapi import execute_admin_query
from manifold.core.query import Query
def get_or_post (self, request, method):
errors = []
- #authorities_query = Query.get('authority').\
- # select('name', 'authority_hrn')
+ # Using cache manifold-tables to get the list of authorities faster
+ authorities_query = Query.get('authority').select('name', 'authority_hrn')
#onelab_enabled_query = Query.get('local:platform').filter_by('platform', '==', 'ple').filter_by('disabled', '==', 'False')
#onelab_enabled = not not execute_admin_query(request, onelab_enabled_query)
#if onelab_enabled:
if True:
print "ONELAB ENABLED"
- authorities_query = Query.get('ple:authority').select('name', 'authority_hrn').filter_by('authority_hrn', 'included', ['ple.inria', 'ple.upmc', 'ple.ibbtple', 'ple.nitos'])
+ #authorities_query = Query.get('ple:authority').select('name', 'authority_hrn').filter_by('authority_hrn', 'included', ['ple.inria', 'ple.upmc', 'ple.ibbtple', 'ple.nitos'])
+ # Now using Cache
else:
print "FIREXP ENABLED"
#keypair = re.sub("\n", "\\n", keypair)
#keypair = keypair.rstrip('\r\n')
#keypair = ''.join(keypair.split())
+ #for sending email: removing existing double qoute
+ public_key = public_key.replace('"', '');
else:
up_file = request.FILES['user_public_key']
file_content = up_file.read()
auth_type = 'user'
# for sending email
public_key = file_content
+ public_key = ''.join(public_key.split())
else:
errors.append('Please upload a valid RSA public key [.txt or .pub].')
'authority_hrn' : reg_auth,
'email' : reg_email,
'user_hrn' : user_hrn,
- 'keypair' : 'Public Key :' + public_key,
+ 'keypair' : 'Public Key: ' + public_key,
'cc_myself' : True # form.cleaned_data['cc_myself']
}
recipients = authority_get_pi_emails(request,reg_auth)
return render(request, 'user_register_complete.html')
template_env = {
- 'topmenu_items': topmenu_items('Register', request),
+ 'topmenu_items': topmenu_items_live('Register', page),
'errors': errors,
'firstname': request.POST.get('firstname', ''),
'lastname': request.POST.get('lastname', ''),