From d72cfe7d428b0e2a5788847d37563b5ebb5db658 Mon Sep 17 00:00:00 2001
From: Samuel Gaist <samuel.gaist@idiap.ch>
Date: Wed, 7 Mar 2018 15:16:43 +0100
Subject: [PATCH] [experiments][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/experiments/views.py | 97 ++++++++++++++++-------------------
1 file changed, 43 insertions(+), 54 deletions(-)
diff --git a/beat/web/experiments/views.py b/beat/web/experiments/views.py
index 576af7f57..94059074e 100644
--- a/beat/web/experiments/views.py
+++ b/beat/web/experiments/views.py
@@ -26,9 +26,8 @@
###############################################################################
from django.shortcuts import get_object_or_404
-from django.shortcuts import render_to_response, redirect
+from django.shortcuts import render, redirect
from django.http import Http404
-from django.template import RequestContext
from django.contrib.auth.decorators import login_required
from django.contrib.auth.models import User
from django.conf import settings
@@ -59,14 +58,12 @@ def new_from_toolchain(request, toolchain_author_name, toolchain_name,
has_access = toolchain.accessibility_for(request.user)[0]
if not(has_access): raise Http404()
- return render_to_response(
- 'experiments/setup.html',
- {
- 'toolchain': toolchain,
- 'action': 'new',
- },
- context_instance=RequestContext(request),
- )
+ return render(request,
+ 'experiments/setup.html',
+ {
+ 'toolchain': toolchain,
+ 'action': 'new',
+ })
#----------------------------------------------------------
@@ -91,15 +88,13 @@ def fork(request, author_name, toolchain_author_name,
(has_access, accessibility) = experiment.accessibility_for(request.user)
if not(has_access): raise Http404()
- return render_to_response(
- 'experiments/setup.html',
- {
- 'toolchain': experiment.toolchain,
- 'experiment': experiment,
- 'action': 'fork',
- },
- context_instance=RequestContext(request),
- )
+ return render(request,
+ 'experiments/setup.html',
+ {
+ 'toolchain': experiment.toolchain,
+ 'experiment': experiment,
+ 'action': 'fork',
+ })
#----------------------------------------------------------
@@ -146,30 +141,26 @@ def view(request, author_name, toolchain_author_name, toolchain_name,
if experiment.status == Experiment.PENDING:
if request.user.is_anonymous(): raise Http404()
- return render_to_response(
- 'experiments/setup.html',
- {
- 'toolchain': experiment.toolchain,
- 'experiment': experiment,
- 'action': 'pending',
- },
- context_instance=RequestContext(request),
- )
+ return render(request,
+ 'experiments/setup.html',
+ {
+ 'toolchain': experiment.toolchain,
+ 'experiment': experiment,
+ 'action': 'pending',
+ })
# Users the object can be shared with
users = User.objects.exclude(username__in=settings.ACCOUNTS_TO_EXCLUDE_FROM_TEAMS).order_by('username')
# The experiment was already done, show results
- return render_to_response(
- 'experiments/view.html',
- {
- 'experiment': experiment,
- 'owner': experiment.author == request.user,
- 'users': users,
- 'teams': Team.objects.for_user(request.user, True)
- },
- context_instance=RequestContext(request),
- )
+ return render(request,
+ 'experiments/view.html',
+ {
+ 'experiment': experiment,
+ 'owner': experiment.author == request.user,
+ 'users': users,
+ 'teams': Team.objects.for_user(request.user, True)
+ })
#----------------------------------------------------------
@@ -193,14 +184,13 @@ def ls(request, author_name):
owner = (request.user == author)
- return render_to_response('experiments/list.html',
- dict(
- objects=objects,
- author=author,
- owner=owner,
- ),
- context_instance=RequestContext(request),
- )
+ return render(request,
+ 'experiments/list.html',
+ dict(
+ objects=objects,
+ author=author,
+ owner=owner,
+ ))
#----------------------------------------------------------
@@ -212,11 +202,10 @@ def public_ls(request):
# orders so that recent objects are displayed first
objects = Experiment.objects.public().exclude(status=Experiment.PENDING).annotate(updated=Coalesce('end_date', 'start_date', 'creation_date')).order_by('-updated')
- return render_to_response('experiments/list.html',
- dict(
- objects=objects,
- author=request.user, #anonymous
- owner=False,
- ),
- context_instance=RequestContext(request),
- )
+ return render(request,
+ 'experiments/list.html',
+ dict(
+ objects=objects,
+ author=request.user, #anonymous
+ owner=False,
+ ))
--
GitLab