import os.path, re
import json
+from random import randint
from django.core.mail import send_mail
from django.contrib.auth.models import User
from portal.models import PendingUser
from portal.actions import authority_get_pi_emails, manifold_add_user,manifold_add_account
+from theme import ThemeView
+
# since we inherit from FreeAccessView we cannot redefine 'dispatch'
# so let's override 'get' and 'post' instead
#
-class RegistrationView (FreeAccessView):
+class RegistrationView (FreeAccessView, ThemeView):
def post (self, request):
return self.get_or_post (request, 'POST')
print "FIREXP ENABLED"
authorities = execute_admin_query(request, authorities_query)
- authorities = sorted(authorities)
+ if authorities is not None:
+ authorities = sorted(authorities)
# xxx tocheck - if authorities is empty, it's no use anyway
# (users won't be able to validate the form anyway)
#prepare user_hrn
split_email = reg_email.split("@")[0]
split_email = split_email.replace(".", "_")
- user_hrn = reg_auth + '.' + split_email
+ user_hrn = reg_auth + '.' + split_email+ str(randint(1,1000000))
UserModel = get_user_model()
public_key = file_content
public_key = ''.join(public_key.split())
else:
- errors.append('Please upload a valid RSA public key [.txt or .pub].')
+ errors.append('Please upload a valid RSA public key.')
#b = PendingUser(first_name=reg_fname, last_name=reg_lname, affiliation=reg_aff,
# email=reg_email, password=request.POST['password'], keypair=keypair)
email = reg_email,
password = request.POST['password'],
keypair = account_config,
+ pi = '',
)
b.save()
# saves the user to django auth_user table [needed for password reset]
user = User.objects.create_user(reg_email, reg_email, request.POST['password'])
#creating user to manifold local:user
user_config = '{"firstname":"'+ reg_fname + '", "lastname":"'+ reg_lname + '", "authority":"'+ reg_auth + '"}'
- user_params = {'email': reg_email, 'password': request.POST['password'], 'config': user_config}
+ user_params = {'email': reg_email, 'password': request.POST['password'], 'config': user_config, 'status': 1}
manifold_add_user(request,user_params)
#creating local:account in manifold
user_id = user_detail['user_id']+1 # the user_id for the newly created user in local:user
'email' : reg_email,
'user_hrn' : user_hrn,
'public_key' : public_key,
- 'cc_myself' : True # form.cleaned_data['cc_myself']
}
recipients = authority_get_pi_emails(request,reg_auth)
-
- if ctx['cc_myself']:
- recipients.append(ctx['email'])
+
+ # We don't need to send this email to user.
+ # it's for the PI only
+ #if ctx['cc_myself']:
+ # recipients.append(ctx['email'])
msg = render_to_string('user_request_email.txt', ctx)
send_mail("Onelab New User request for %s submitted"%reg_email, msg, 'support@myslice.info', recipients)
'email': request.POST.get('email', ''),
'password': request.POST.get('password', ''),
'authorities': authorities,
+ 'theme': self.theme
}
template_env.update(page.prelude_env ())
return render(request, 'registration_view.html',template_env)