import os.path, re
+import json
from django.core.mail import send_mail
from django.shortcuts import render
from unfold.page import Page
+from unfold.loginrequired import FreeAccessView
from ui.topmenu import topmenu_items
from manifold.manifoldapi import execute_admin_query
from portal.models import PendingUser
from portal.actions import authority_get_pi_emails
-# This is a rough porting from views.py
-# the former function-based view is now made a class
-# we redefine dispatch as it is simple
-# and coincidentally works since we do not need LoginRequiredAutoLogoutView
-# a second stab should redefine post and get instead
-# also this was not thoroughly tested either, might miss some imports
-# to be continued...
+# since we inherit from FreeAccessView we cannot redefine 'dispatch'
+# so let's override 'get' and 'post' instead
+#
+class RegistrationView (FreeAccessView):
-class RegistrationView (View):
+ def post (self, request):
+ return self.get_or_post (request, 'POST')
- def dispatch (self, request):
+ def get (self, request):
+ return self.get_or_post (request, 'GET')
+ def get_or_post (self, request, method):
errors = []
- authorities_query = Query.get('authority').\
- select('name', 'authority_hrn')
+ #authorities_query = Query.get('authority').\
+ # select('name', 'authority_hrn')
- 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:
+ #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 = authorities_query.filter_by('authority_hrn', 'included', ['ple.inria', 'ple.upmc'])
+ authorities_query = Query.get('ple:authority').select('name', 'authority_hrn').filter_by('authority_hrn', 'included', ['ple.inria', 'ple.upmc', 'ple.ibbtple', 'ple.nitos'])
else:
print "FIREXP ENABLED"
page.add_js_files ( [ "js/jquery.validate.js", "js/my_account.register.js" ] )
page.add_css_files ( [ "css/onelab.css", "css/registration.css" ] )
- print 'registration view, method',request.method
+ print 'registration view, method',method
- if request.method == 'POST':
+ if method == 'POST':
# We shall use a form here
#get_email = PendingUser.objects.get(email)
- reg_fname = request.POST.get('firstname', '')
- reg_lname = request.POST.get('lastname', '')
- #reg_aff = request.POST.get('affiliation','')
- reg_auth = request.POST.get('authority_hrn', '')
- reg_email = request.POST.get('email','').lower()
+ reg_fname = request.POST.get('firstname', '')
+ reg_lname = request.POST.get('lastname', '')
+ #reg_aff = request.POST.get('affiliation','')
+ reg_auth = request.POST.get('authority_hrn', '')
+ reg_login = request.POST.get('login', '')
+ reg_email = request.POST.get('email','').lower()
#POST value validation
if (re.search(r'^[\w+\s.@+-]+$', reg_fname)==None):
#b.save()
if not errors:
b = PendingUser(
- first_name=reg_fname,
- last_name=reg_lname,
- #affiliation=reg_aff,
- authority_hrn=reg_auth,
- email=reg_email,
- password=request.POST['password'],
- keypair=keypair
- )
+ first_name = reg_fname,
+ last_name = reg_lname,
+ #affiliation = reg_aff,
+ authority_hrn = reg_auth,
+ login = reg_login,
+ email = reg_email,
+ password = request.POST['password'],
+ keypair = keypair,
+ )
b.save()
# Send email
'keypair' : 'Public Key :' + public_key,
'cc_myself' : True # form.cleaned_data['cc_myself']
}
- #not working
- #recipients = authority_get_pi_emails(request,reg_auth)
- recipients = ['devel@myslice.info']
+
+ recipients = authority_get_pi_emails(request,reg_auth)
+
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')