1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-20 10:58:33 +00:00

FIx feature removed issue in Django1.10. render_to_response() -> render(), remove context_instance arg in `render_to_string()'

This commit is contained in:
ilearnit
2018-03-15 16:44:10 +08:00
parent 1182a80989
commit 3526b2b5cf
21 changed files with 225 additions and 264 deletions

View File

@@ -5,8 +5,7 @@ Views which allow users to create and activate accounts.
from django.shortcuts import redirect
from django.shortcuts import render_to_response
from django.template import RequestContext
from django.shortcuts import render
from django.http import Http404
from registration.backends import get_backend
@@ -87,13 +86,13 @@ def activate(request, backend,
if extra_context is None:
extra_context = {}
context = RequestContext(request)
context = {}
for key, value in extra_context.items():
context[key] = callable(value) and value() or value
return render_to_response(template_name,
return render(request, template_name,
kwargs,
context_instance=context)
context=context)
def register(request, backend, success_url=None, form_class=None,
@@ -206,7 +205,8 @@ def register(request, backend, success_url=None, form_class=None,
if extra_context is None:
extra_context = {}
context = RequestContext(request)
from django.template import RequestContext
context = {}
for key, value in extra_context.items():
context[key] = callable(value) and value() or value
@@ -214,9 +214,9 @@ def register(request, backend, success_url=None, form_class=None,
if src:
form = form_class(initial={'email': src})
return render_to_response(template_name, {
'form': form,
'min_len': config.USER_PASSWORD_MIN_LENGTH,
'strong_pwd_required': config.USER_STRONG_PASSWORD_REQUIRED,
'level': config.USER_PASSWORD_STRENGTH_LEVEL,
}, context_instance=context)
context['form'] = form
context['min_len'] = config.USER_PASSWORD_MIN_LENGTH
context['strong_pwd_required'] = config.USER_STRONG_PASSWORD_REQUIRED
context['level'] = config.USER_PASSWORD_STRENGTH_LEVEL
return render(request, template_name, context)