diff --git a/beat/web/plotters/views.py b/beat/web/plotters/views.py
index 71a9b270454d53146e9993a8ca0d78070395de91..2bf1c23623e060130f1fc72e89c6c66cd24d64d7 100644
--- a/beat/web/plotters/views.py
+++ b/beat/web/plotters/views.py
@@ -37,9 +37,9 @@ import simplejson
from django.http import HttpResponse, HttpResponseForbidden, HttpResponseBadRequest
from django.conf import settings
-from django.shortcuts import render_to_response
+from django.shortcuts import render
from django.shortcuts import get_object_or_404
-from django.template import RequestContext, Context
+from django.template import Context
from django.contrib.auth.decorators import login_required
from django.contrib.auth.models import User
from django.views.generic import TemplateView
@@ -614,14 +614,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('plotters/view.html',
- {
- 'plotter': plotter,
- 'owner': owner,
- 'users': users,
- 'teams': Team.objects.for_user(request.user, True)
- },
- context_instance=RequestContext(request))
+ return render(request,
+ 'plotters/view.html',
+ {
+ 'plotter': plotter,
+ 'owner': owner,
+ 'users': users,
+ 'teams': Team.objects.for_user(request.user, True)
+ })
#----------------------------------------------------------
@@ -639,14 +639,14 @@ def list_plotters(request):
objects=Plotter.objects.from_author_and_public(request.user,request.user.username)
owner=(request.user==author)
- return render_to_response('plotters/list.html',
- dict(
- objects=objects,
- author=author,
- owner=owner,
- ),
- context_instance=RequestContext(request),
- )
+ return render(request,
+ 'plotters/list.html',
+ dict(
+ objects=objects,
+ author=author,
+ owner=owner,
+ ))
+
#----------------------------------------------------------
@@ -657,14 +657,13 @@ def list_plotters_public(request):
# orders so that objects with latest information are displayed first
objects=Plotter.objects.public().order_by('-creation_date')
- return render_to_response('plotters/list.html',
- dict(
- objects=objects,
- author=request.user, #anonymous
- owner=False,
- ),
- context_instance=RequestContext(request),
- )
+ return render(request,
+ 'plotters/list.html',
+ dict(
+ objects=objects,
+ author=request.user, #anonymous
+ owner=False,
+ ))
#----------------------------------------------------------
@@ -681,14 +680,13 @@ def list_plotterparameters(request, author_name):
owner=(request.user==author)
- return render_to_response('plotterparameters/list.html',
- dict(
- objects=objects,
- author=author,
- owner=owner,
- ),
- context_instance=RequestContext(request),
- )
+ return render(request,
+ 'plotterparameters/list.html',
+ dict(
+ objects=objects,
+ author=author,
+ owner=owner,
+ ))
#----------------------------------------------------------
@@ -701,14 +699,13 @@ def list_plotterparameters_public(request):
objects = PlotterParameter.objects.public().order_by('-creation_date')
objects = PlotterParameter.filter_latest_versions(objects)
- return render_to_response('plotterparameters/list.html',
- dict(
- objects=objects,
- author=request.user, #anonymous
- owner=False,
- ),
- context_instance=RequestContext(request),
- )
+ return render(request,
+ 'plotterparameters/list.html',
+ dict(
+ objects=objects,
+ author=request.user, #anonymous
+ owner=False,
+ ))
#----------------------------------------------------------
@@ -725,14 +722,13 @@ def plotterparameter_latest(request, author, name):
objects = PlotterParameter.filter_latest_versions(objects)
- return render_to_response('plotterparameters/list.html',
- dict(
- objects=objects,
- author=request.user, #anonymous
- owner=False,
- ),
- context_instance=RequestContext(request),
- )
+ return render(request,
+ 'plotterparameters/list.html',
+ dict(
+ objects=objects,
+ author=request.user, #anonymous
+ owner=False,
+ ))
@@ -758,18 +754,18 @@ def plotterparameter_for_author(request, author_name, plotterparameter_name, ver
# Users the object can be shared with
users = User.objects.exclude(username__in=settings.ACCOUNTS_TO_EXCLUDE_FROM_TEAMS).order_by('username')
- return render_to_response('plotterparameters/plotterparameter.html',
- {
- 'author' : author_name,
- 'plotterparameter_name' : plotterparameter_name,
- 'owner' : (request.user == obj.author),
- 'users': users,
- 'teams': Team.objects.for_user(request.user, True),
- 'plotterparameter' : obj,
- 'plotter_origin' : plotter_origin,
- 'USE_HTTPS_GRAVATAR': settings.USE_HTTPS_GRAVATAR,
- },
- context_instance=RequestContext(request))
+ return render(request,
+ 'plotterparameters/plotterparameter.html',
+ {
+ 'author' : author_name,
+ 'plotterparameter_name' : plotterparameter_name,
+ 'owner' : (request.user == obj.author),
+ 'users': users,
+ 'teams': Team.objects.for_user(request.user, True),
+ 'plotterparameter' : obj,
+ 'plotter_origin' : plotter_origin,
+ 'USE_HTTPS_GRAVATAR': settings.USE_HTTPS_GRAVATAR,
+ })
#----------------------------------------------------------
@@ -798,14 +794,14 @@ def diff(request, author1, name1, version1, author2, name2, version2):
has_access, _ = plotterparameter2.accessibility_for(request.user)
if not has_access: raise Http404()
- return render_to_response('plotterparameters/diff.html',
- {
- 'plotterparameter1': plotterparameter1,
- 'plotterparameter1_data': simplejson.loads(plotterparameter1.data),
- 'plotterparameter2': plotterparameter2,
- 'plotterparameter2_data': simplejson.loads(plotterparameter2.data),
- },
- context_instance=RequestContext(request))
+ return render(request,
+ 'plotterparameters/diff.html',
+ {
+ 'plotterparameter1': plotterparameter1,
+ 'plotterparameter1_data': simplejson.loads(plotterparameter1.data),
+ 'plotterparameter2': plotterparameter2,
+ 'plotterparameter2_data': simplejson.loads(plotterparameter2.data),
+ })
#----------------------------------------------------------
@@ -822,17 +818,16 @@ def create_plotterparameter(request, author_name):
owner=(request.user==author)
- return render_to_response('plotterparameters/plotterparameter.html',
- dict(
- objects=objects,
- author=author,
- owner=owner,
- plotterparameter_name="CREATION_MODE",
- plotterparameter="CREATION_MODE",
- USE_HTTPS_GRAVATAR=settings.USE_HTTPS_GRAVATAR,
- ),
- context_instance=RequestContext(request),
- )
+ return render(request,
+ 'plotterparameters/plotterparameter.html',
+ dict(
+ objects=objects,
+ author=author,
+ owner=owner,
+ plotterparameter_name="CREATION_MODE",
+ plotterparameter="CREATION_MODE",
+ USE_HTTPS_GRAVATAR=settings.USE_HTTPS_GRAVATAR,
+ ))
#------------------------------------------------
@@ -877,17 +872,16 @@ def create_new_version(request, author_name=None, plotterparameter_name=None, ve
declaration, errors = prototypes.load('toolchain')
parameters['declaration'] = simplejson.dumps(declaration)
- return render_to_response('plotterparameters/plotterparameter.html',
- dict(
- author=request.user.username,
- parameters=parameters,
- plotterparameter_name=plotterparameter_name,
- plotterparameter=plotterparameter,
- owner=(request.user == plotterparameter.author),
- plotterparameter_mode="NEW_VERSION_MODE",
- ),
- context_instance=RequestContext(request),
- )
+ return render(request,
+ 'plotterparameters/plotterparameter.html',
+ dict(
+ author=request.user.username,
+ parameters=parameters,
+ plotterparameter_name=plotterparameter_name,
+ plotterparameter=plotterparameter,
+ owner=(request.user == plotterparameter.author),
+ plotterparameter_mode="NEW_VERSION_MODE",
+ ))
@login_required
@@ -918,17 +912,16 @@ def fork(request, author_name, plotterparameter_name, version):
'request_user': request.user.username,
}
- return render_to_response('plotterparameters/plotterparameter.html',
- dict(
- author=request.user.username,
- parameters=parameters,
- plotterparameter_name=plotterparameter_name,
- plotterparameter=fork_of,
- owner=(request.user == fork_of.author),
- plotterparameter_mode="FORK_MODE",
- ),
- context_instance=RequestContext(request),
- )
+ return render(request,
+ 'plotterparameters/plotterparameter.html',
+ dict(
+ author=request.user.username,
+ parameters=parameters,
+ plotterparameter_name=plotterparameter_name,
+ plotterparameter=fork_of,
+ owner=(request.user == fork_of.author),
+ plotterparameter_mode="FORK_MODE",
+ ))