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

[algorithms][views] Moved from render_to_response to render

render_to_response is deprecated in Django 2.0 and render has
been available since 1.3. It's shorter to write and avoids the
writing of context_instance=RequestContext(request) in each of
its call.
parent dec23d8e
No related branches found
No related tags found
2 merge requests!2551.4.x,!238Upgrade to django 1.11
...@@ -27,8 +27,7 @@ ...@@ -27,8 +27,7 @@
from django.http import Http404, HttpResponseForbidden from django.http import Http404, HttpResponseForbidden
from django.shortcuts import get_object_or_404 from django.shortcuts import get_object_or_404
from django.shortcuts import render_to_response from django.shortcuts import render
from django.template import RequestContext
from django.contrib.auth.decorators import login_required from django.contrib.auth.decorators import login_required
from django.conf import settings from django.conf import settings
from django.contrib.auth.models import User from django.contrib.auth.models import User
...@@ -95,9 +94,7 @@ def create(request, name=None): ...@@ -95,9 +94,7 @@ def create(request, name=None):
declaration['language'] = 'python' declaration['language'] = 'python'
parameters['declaration'] = json.dumps(declaration) parameters['declaration'] = json.dumps(declaration)
return render_to_response('algorithms/edition.html', return render(request, 'algorithms/edition.html', parameters)
parameters,
context_instance=RequestContext(request))
#---------------------------------------------------------- #----------------------------------------------------------
...@@ -144,9 +141,7 @@ def fork(request, author, name, version): ...@@ -144,9 +141,7 @@ def fork(request, author, name, version):
if not fork_of.is_binary(): if not fork_of.is_binary():
parameters['source_code'] = fork_of.source_code_file.read() parameters['source_code'] = fork_of.source_code_file.read()
return render_to_response('algorithms/edition.html', return render(request, 'algorithms/edition.html', parameters)
parameters,
context_instance=RequestContext(request))
#---------------------------------------------------------- #----------------------------------------------------------
...@@ -193,9 +188,7 @@ def edit(request, author, name, version): ...@@ -193,9 +188,7 @@ def edit(request, author, name, version):
if not algorithm.is_binary(): if not algorithm.is_binary():
parameters['source_code'] = algorithm.source_code_file.read() parameters['source_code'] = algorithm.source_code_file.read()
return render_to_response('algorithms/edition.html', return render(request, 'algorithms/edition.html', parameters)
parameters,
context_instance=RequestContext(request))
#---------------------------------------------------------- #----------------------------------------------------------
...@@ -232,14 +225,14 @@ def view(request, author, name, version=None): ...@@ -232,14 +225,14 @@ def view(request, author, name, version=None):
users = User.objects.exclude(username__in=settings.ACCOUNTS_TO_EXCLUDE_FROM_TEAMS).order_by('username') users = User.objects.exclude(username__in=settings.ACCOUNTS_TO_EXCLUDE_FROM_TEAMS).order_by('username')
# Render the page # Render the page
return render_to_response('algorithms/view.html', return render(request,
{ 'algorithms/view.html',
'algorithm': algorithm, {
'owner': owner, 'algorithm': algorithm,
'users': users, 'owner': owner,
'teams': Team.objects.for_user(request.user, True) 'users': users,
}, 'teams': Team.objects.for_user(request.user, True)
context_instance=RequestContext(request)) })
#---------------------------------------------------------- #----------------------------------------------------------
...@@ -250,15 +243,15 @@ def diff(request, author1, name1, version1, author2, name2, version2): ...@@ -250,15 +243,15 @@ def diff(request, author1, name1, version1, author2, name2, version2):
retrieve the details about the algorithms and check the accessibility. retrieve the details about the algorithms and check the accessibility.
""" """
return render_to_response('algorithms/diff.html', return render(request,
{'algorithm1_author': author1, 'algorithms/diff.html',
'algorithm1_name': name1, {'algorithm1_author': author1,
'algorithm1_version': version1, 'algorithm1_name': name1,
'algorithm2_author': author2, 'algorithm1_version': version1,
'algorithm2_name': name2, 'algorithm2_author': author2,
'algorithm2_version': version2, 'algorithm2_name': name2,
}, 'algorithm2_version': version2,
context_instance=RequestContext(request)) })
#---------------------------------------------------------- #----------------------------------------------------------
...@@ -277,14 +270,13 @@ def ls(request, author_name): ...@@ -277,14 +270,13 @@ def ls(request, author_name):
author_name).order_by('-creation_date') author_name).order_by('-creation_date')
objects = Algorithm.filter_latest_versions(objects) objects = Algorithm.filter_latest_versions(objects)
return render_to_response('algorithms/list.html', return render(request,
dict( 'algorithms/list.html',
objects=objects, dict(
author=author, objects=objects,
owner=(request.user==author), author=author,
), owner=(request.user == author)
context_instance=RequestContext(request), ))
)
#---------------------------------------------------------- #----------------------------------------------------------
...@@ -297,11 +289,10 @@ def public_ls(request): ...@@ -297,11 +289,10 @@ def public_ls(request):
objects = Algorithm.objects.public().order_by('-creation_date') objects = Algorithm.objects.public().order_by('-creation_date')
objects = Algorithm.filter_latest_versions(objects) objects = Algorithm.filter_latest_versions(objects)
return render_to_response('algorithms/list.html', return render(request,
dict( 'algorithms/list.html',
objects=objects, dict(
author=request.user, #anonymous objects=objects,
owner=False, author=request.user, # anonymous
), owner=False
context_instance=RequestContext(request), ))
)
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