from django.shortcuts import render
from unfold.page import Page
-from myslice.viewutils import topmenu_items
+from ui.topmenu import topmenu_items
-from manifold.manifoldapi import execute_query
+from manifold.manifoldapi import execute_admin_query
from manifold.core.query import Query
from portal.models import PendingUser
errors = []
authorities_query = Query.get('authority').\
- filter_by('authority_hrn', 'included', ['ple.inria', 'ple.upmc']).\
select('name', 'authority_hrn')
- #authorities_query = Query.get('authority').select('authority_hrn')
- authorities = execute_query(request, authorities_query)
+
+ onelab_enabled_query = Query.get('local:platform').filter_by('platform', '==', 'ple-onelab').filter_by('disabled', '==', 'False')
+ onelab_enabled = not not execute_admin_query(request, onelab_enabled_query)
+ if onelab_enabled:
+ print "ONELAB ENABLED"
+ authorities_query = authorities_query.filter_by('authority_hrn', 'included', ['ple.inria', 'ple.upmc'])
+ else:
+ print "FIREXP ENABLED"
+
+ authorities = execute_admin_query(request, authorities_query)
# xxx tocheck - if authorities is empty, it's no use anyway
# (users won't be able to validate the form anyway)
keypair = re.sub("\r", "", keypair)
keypair = re.sub("\n", "\\n",keypair)
keypair = ''.join(keypair.split())
+ # for sending email
+ public_key = file_content
else:
errors.append('Please upload a valid RSA public key [.txt or .pub].')
# Send email
ctx = {
- 'first_name' : reg_fname,
- 'last_name' : reg_lname,
- 'authority_hrn': reg_auth,
- 'email' : reg_email,
- 'keypair' : keypair,
- 'cc_myself' : True # form.cleaned_data['cc_myself']
+ 'first_name' : reg_fname,
+ 'last_name' : reg_lname,
+ 'authority_hrn' : reg_auth,
+ 'email' : reg_email,
+ 'keypair' : 'Public Key :' + public_key,
+ 'cc_myself' : True # form.cleaned_data['cc_myself']
}
-
- recipients = authority_get_pi_emails(request,reg_auth)
+ #not working
+ #recipients = authority_get_pi_emails(request,reg_auth)
+ recipients = ['devel@myslice.info']
if ctx['cc_myself']:
recipients.append(ctx['email'])
msg = render_to_string('user_request_email.txt', ctx)
+ print "tesing msg"
+ print msg
send_mail("Onelab New User request for %s submitted"%reg_email, msg, reg_email, recipients)
return render(request, 'user_register_complete.html')