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

[dataformats][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 86f9cece
No related branches found
No related tags found
2 merge requests!2551.4.x,!238Upgrade to django 1.11
...@@ -29,8 +29,7 @@ from django.http import HttpResponseRedirect ...@@ -29,8 +29,7 @@ from django.http import HttpResponseRedirect
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.http import Http404 from django.http import Http404
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.views.decorators.csrf import csrf_protect from django.views.decorators.csrf import csrf_protect
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
...@@ -133,14 +132,14 @@ def create(request, name=None): ...@@ -133,14 +132,14 @@ def create(request, name=None):
form = CreationForm(**form_args) form = CreationForm(**form_args)
return render_to_response('dataformats/edition.html', return render(request,
{ 'dataformats/edition.html',
'form': form, {
'object': previous_version, 'form': form,
'op': 'new-version' if previous_version else 'new', 'object': previous_version,
'edition': False, 'op': 'new-version' if previous_version else 'new',
}, 'edition': False,
context_instance=RequestContext(request)) })
#---------------------------------------------------------- #----------------------------------------------------------
...@@ -210,13 +209,13 @@ def fork(request, author, name, version): ...@@ -210,13 +209,13 @@ def fork(request, author, name, version):
form = CreationForm(**form_args) form = CreationForm(**form_args)
return render_to_response('dataformats/edition.html', return render(request,
{ 'dataformats/edition.html',
'form': form, {
'object': fork_of, 'form': form,
'op': 'fork', 'object': fork_of,
}, 'op': 'fork',
context_instance=RequestContext(request)) })
#---------------------------------------------------------- #----------------------------------------------------------
...@@ -287,12 +286,12 @@ def edit(request, author, name, version): ...@@ -287,12 +286,12 @@ def edit(request, author, name, version):
form = UpdateForm(**form_args) form = UpdateForm(**form_args)
return render_to_response('dataformats/edition.html', return render(request,
{'form': form, 'dataformats/edition.html',
'op': 'edit', {'form': form,
'object': dataformat, 'op': 'edit',
}, 'object': dataformat,
context_instance=RequestContext(request)) })
#---------------------------------------------------------- #----------------------------------------------------------
...@@ -328,14 +327,14 @@ def view(request, author, name, version=None): ...@@ -328,14 +327,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('dataformats/view.html', return render(request,
{ 'dataformats/view.html',
'dataformat': dataformat, {
'owner': owner, 'dataformat': dataformat,
'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)) })
#---------------------------------------------------------- #----------------------------------------------------------
...@@ -351,15 +350,15 @@ def diff(request, author1, name1, version1, author2, name2, version2): ...@@ -351,15 +350,15 @@ def diff(request, author1, name1, version1, author2, name2, version2):
""" """
return render_to_response('dataformats/diff.html', return render(request,
{'dataformat1_author': author1, 'dataformats/diff.html',
'dataformat1_name': name1, {'dataformat1_author': author1,
'dataformat1_version': version1, 'dataformat1_name': name1,
'dataformat2_author': author2, 'dataformat1_version': version1,
'dataformat2_name': name2, 'dataformat2_author': author2,
'dataformat2_version': version2, 'dataformat2_name': name2,
}, 'dataformat2_version': version2,
context_instance=RequestContext(request)) })
#---------------------------------------------------------- #----------------------------------------------------------
...@@ -378,14 +377,13 @@ def ls(request, author_name): ...@@ -378,14 +377,13 @@ def ls(request, author_name):
author_name).order_by('-creation_date') author_name).order_by('-creation_date')
objects = DataFormat.filter_latest_versions(objects) objects = DataFormat.filter_latest_versions(objects)
return render_to_response('dataformats/list.html', return render(request,
dict( 'dataformats/list.html',
objects=objects, dict(
author=author, objects=objects,
owner=(request.user==author), author=author,
), owner=(request.user == author)
context_instance=RequestContext(request), ))
)
#---------------------------------------------------------- #----------------------------------------------------------
...@@ -398,11 +396,10 @@ def public_ls(request): ...@@ -398,11 +396,10 @@ def public_ls(request):
objects = DataFormat.objects.public().order_by('-creation_date') objects = DataFormat.objects.public().order_by('-creation_date')
objects = DataFormat.filter_latest_versions(objects) objects = DataFormat.filter_latest_versions(objects)
return render_to_response('dataformats/list.html', return render(request,
dict( 'dataformats/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