Skip to content
Snippets Groups Projects
Commit ad8e6c21 authored by Samuel GAIST's avatar Samuel GAIST
Browse files

[ui][registration][views] Remove old context processing

It's now done by render
parent acc8b01b
No related branches found
No related tags found
1 merge request!2551.4.x
Pipeline #23942 passed
...@@ -91,15 +91,15 @@ def activate(request, activation_key, ...@@ -91,15 +91,15 @@ def activate(request, activation_key,
""" """
activationKey = activation_key.lower() # Normalize before trying anything with it. activationKey = activation_key.lower() # Normalize before trying anything with it.
account = RegistrationProfile.objects.activate_user(activation_key) account = RegistrationProfile.objects.activate_user(activation_key)
if extra_context is None:
extra_context = {} context = { 'account': account,
context = RequestContext(request) 'expiration_days': settings.ACCOUNT_ACTIVATION_DAYS }
for key, value in extra_context.items():
context[key] = callable(value) and value() or value if extra_context is not None:
return render(request, for key, value in extra_context.items():
template_name, context[key] = callable(value) and value() or value
{ 'account': account,
'expiration_days': settings.ACCOUNT_ACTIVATION_DAYS }) return render(request, template_name, context)
@csrf_protect @csrf_protect
...@@ -195,18 +195,14 @@ def register(request, success_url=None, ...@@ -195,18 +195,14 @@ def register(request, success_url=None,
form = form_class() form = form_class()
form_supervisor = RegistrationFormTermsOfServiceSupervisor() form_supervisor = RegistrationFormTermsOfServiceSupervisor()
if extra_context is None:
extra_context = {} context = { 'form': form,
'form_supervisor': form_supervisor,
context = RequestContext(request) 'supervisor_form_active': supervisor_form_active,
for key, value in extra_context.items(): 'url_prefix':settings.URL_PREFIX }
context[key] = callable(value) and value() or value
if extra_context is not None:
return render(request, for key, value in extra_context.items():
template_name, context[key] = callable(value) and value() or value
{
'form': form, return render(request, template_name, context)
'form_supervisor': form_supervisor,
'supervisor_form_active': supervisor_form_active,
'url_prefix':settings.URL_PREFIX,
})
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment