From 1e3900e71985c162700a633d2c87cd12747d26d4 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Wed, 7 Mar 2018 15:15:47 +0100
Subject: [PATCH] [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.
---
beat/web/algorithms/views.py | 79 ++++++++++++++++--------------------
1 file changed, 35 insertions(+), 44 deletions(-)
diff --git a/beat/web/algorithms/views.py b/beat/web/algorithms/views.py
index 62f3ace9d..c64cbf44f 100755
--- a/beat/web/algorithms/views.py
+++ b/beat/web/algorithms/views.py
@@ -27,8 +27,7 @@
from django.http import Http404, HttpResponseForbidden
from django.shortcuts import get_object_or_404
-from django.shortcuts import render_to_response
-from django.template import RequestContext
+from django.shortcuts import render
from django.contrib.auth.decorators import login_required
from django.conf import settings
from django.contrib.auth.models import User
@@ -95,9 +94,7 @@ def create(request, name=None):
declaration['language'] = 'python'
parameters['declaration'] = json.dumps(declaration)
- return render_to_response('algorithms/edition.html',
- parameters,
- context_instance=RequestContext(request))
+ return render(request, 'algorithms/edition.html', parameters)
#----------------------------------------------------------
@@ -144,9 +141,7 @@ def fork(request, author, name, version):
if not fork_of.is_binary():
parameters['source_code'] = fork_of.source_code_file.read()
- return render_to_response('algorithms/edition.html',
- parameters,
- context_instance=RequestContext(request))
+ return render(request, 'algorithms/edition.html', parameters)
#----------------------------------------------------------
@@ -193,9 +188,7 @@ def edit(request, author, name, version):
if not algorithm.is_binary():
parameters['source_code'] = algorithm.source_code_file.read()
- return render_to_response('algorithms/edition.html',
- parameters,
- context_instance=RequestContext(request))
+ return render(request, 'algorithms/edition.html', parameters)
#----------------------------------------------------------
@@ -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')
# Render the page
- return render_to_response('algorithms/view.html',
- {
- 'algorithm': algorithm,
- 'owner': owner,
- 'users': users,
- 'teams': Team.objects.for_user(request.user, True)
- },
- context_instance=RequestContext(request))
+ return render(request,
+ 'algorithms/view.html',
+ {
+ 'algorithm': algorithm,
+ 'owner': owner,
+ 'users': users,
+ 'teams': Team.objects.for_user(request.user, True)
+ })
#----------------------------------------------------------
@@ -250,15 +243,15 @@ def diff(request, author1, name1, version1, author2, name2, version2):
retrieve the details about the algorithms and check the accessibility.
"""
- return render_to_response('algorithms/diff.html',
- {'algorithm1_author': author1,
- 'algorithm1_name': name1,
- 'algorithm1_version': version1,
- 'algorithm2_author': author2,
- 'algorithm2_name': name2,
- 'algorithm2_version': version2,
- },
- context_instance=RequestContext(request))
+ return render(request,
+ 'algorithms/diff.html',
+ {'algorithm1_author': author1,
+ 'algorithm1_name': name1,
+ 'algorithm1_version': version1,
+ 'algorithm2_author': author2,
+ 'algorithm2_name': name2,
+ 'algorithm2_version': version2,
+ })
#----------------------------------------------------------
@@ -277,14 +270,13 @@ def ls(request, author_name):
author_name).order_by('-creation_date')
objects = Algorithm.filter_latest_versions(objects)
- return render_to_response('algorithms/list.html',
- dict(
- objects=objects,
- author=author,
- owner=(request.user==author),
- ),
- context_instance=RequestContext(request),
- )
+ return render(request,
+ 'algorithms/list.html',
+ dict(
+ objects=objects,
+ author=author,
+ owner=(request.user == author)
+ ))
#----------------------------------------------------------
@@ -297,11 +289,10 @@ def public_ls(request):
objects = Algorithm.objects.public().order_by('-creation_date')
objects = Algorithm.filter_latest_versions(objects)
- return render_to_response('algorithms/list.html',
- dict(
- objects=objects,
- author=request.user, #anonymous
- owner=False,
- ),
- context_instance=RequestContext(request),
- )
+ return render(request,
+ 'algorithms/list.html',
+ dict(
+ objects=objects,
+ author=request.user, # anonymous
+ owner=False
+ ))
--
GitLab