Django 1.11: use render() instead render_to_response - pass dict to templates

3 files changed, 9 insertions, 14 deletions

diff --git a/archaeological_operations/views.py b/archaeological_operations/views.py
index 13b9a4767..1fecce9cd 100644
--- a/archaeological_operations/views.py
+++ b/archaeological_operations/views.py
@@ -22,7 +22,7 @@ import json
 from django.core.urlresolvers import reverse
 from django.db.models import Q
 from django.http import HttpResponse
-from django.shortcuts import render_to_response, redirect
+from django.shortcuts import render, redirect
 from django.utils.translation import ugettext_lazy as _, pgettext_lazy
 
 from ishtar_common.views import get_item, show_item, revert_item, new_item
@@ -160,8 +160,7 @@ def dashboard_operation(request, *args, **kwargs):
     Operation dashboard
     """
     dct = {'dashboard': models.OperationDashboard()}
-    return render_to_response('ishtar/dashboards/dashboard_operation.html',
-                              dct, context_instance=RequestContext(request))
+    return render(request, 'ishtar/dashboards/dashboard_operation.html', dct)
 
 operation_search_wizard = SearchWizard.as_view(
     [('general-operation_search', OperationFormSelection)],
@@ -482,8 +481,7 @@ def administrativeactfile_document(
         dct['search_form'] = search_form()
         dct['template_form'] = DocumentGenerationAdminActForm(
             document_type=document_type)
-    return render_to_response('ishtar/administrativeact_document.html', dct,
-                              context_instance=RequestContext(request))
+    return render(request, 'ishtar/administrativeact_document.html', dct)
 
 
 def reset_wizards(request):
diff --git a/archaeological_operations/widgets.py b/archaeological_operations/widgets.py
index bb219ab76..c34752499 100644
--- a/archaeological_operations/widgets.py
+++ b/archaeological_operations/widgets.py
@@ -19,7 +19,7 @@
 
 from django import forms
 from django.forms import widgets
-from django.template import Context, loader
+from django.template import loader
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext_lazy as _
 
@@ -66,5 +66,5 @@ class OAWidget(forms.TextInput):
                'id': attrs['id'],
                "safe_id": attrs['id'].replace('-', '_')}
         t = loader.get_template('ishtar/blocks/OAWidget.html')
-        rendered = t.render(Context(dct))
+        rendered = t.render(dct)
         return mark_safe(rendered)
diff --git a/archaeological_operations/wizards.py b/archaeological_operations/wizards.py
index 02d462f66..fffe34ca7 100644
--- a/archaeological_operations/wizards.py
+++ b/archaeological_operations/wizards.py
@@ -23,8 +23,7 @@ from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.urlresolvers import reverse
 from django.db.models import Max
-from django.shortcuts import render_to_response
-from django.template import RequestContext
+from django.shortcuts import render
 from django.utils.translation import ugettext_lazy as _
 
 from ishtar_common.forms import reverse_lazy
@@ -430,8 +429,7 @@ class OperationAdministrativeActWizard(OperationWizard):
         self.request.session[self.current_obj_slug] = unicode(admact.pk)
         self.request.session[self.get_object_name(admact)] = unicode(admact.pk)
 
-        res = render_to_response('ishtar/wizard/wizard_done.html', dct,
-                                 context_instance=RequestContext(self.request))
+        res = render(self.request, 'ishtar/wizard/wizard_done.html', dct)
         return res
 
 
@@ -458,9 +456,8 @@ class AdministrativeActDeletionWizard(ClosingWizard):
     def done(self, form_list, **kwargs):
         obj = self.get_current_object()
         obj.delete()
-        return render_to_response(
-            'ishtar/wizard/wizard_delete_done.html', {},
-            context_instance=RequestContext(self.request))
+        return render(
+            self.request, 'ishtar/wizard/wizard_delete_done.html', {})
 
 
 def is_preventive(form_name, model, type_key='operation_type', key=''):