From 9b1fe45772669f33f57bb2b06effb4bfca33cdfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Thu, 28 Dec 2017 09:52:27 +0100
Subject: [PATCH] general: misc update template API usage for django 1.11
 (#20909)

---
 welco/contacts/views.py        | 3 +--
 welco/kb/views.py              | 3 +--
 welco/sources/counter/views.py | 4 +---
 welco/sources/mail/views.py    | 6 +++---
 welco/sources/phone/views.py   | 5 ++---
 welco/views.py                 | 4 ++--
 6 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/welco/contacts/views.py b/welco/contacts/views.py
index aaa6482..b1e340d 100644
--- a/welco/contacts/views.py
+++ b/welco/contacts/views.py
@@ -37,9 +37,8 @@ class HomeZone(object):
         self.request = request
 
     def render(self):
-        context = RequestContext(self.request)
         tmpl = template.loader.get_template('contacts/zone.html')
-        return tmpl.render(context)
+        return tmpl.render(request=self.request)
 
 
 class ContactsZone(TemplateView):
diff --git a/welco/kb/views.py b/welco/kb/views.py
index 6c1f4a3..7054449 100644
--- a/welco/kb/views.py
+++ b/welco/kb/views.py
@@ -225,9 +225,8 @@ class HomeZone(object):
         self.request = request
 
     def render(self):
-        context = RequestContext(self.request)
         tmpl = template.loader.get_template('kb/zone.html')
-        return tmpl.render(context)
+        return tmpl.render(request=self.request)
 
 
 def kb_manager_required(view_func):
diff --git a/welco/sources/counter/views.py b/welco/sources/counter/views.py
index f2962cb..040ea3d 100644
--- a/welco/sources/counter/views.py
+++ b/welco/sources/counter/views.py
@@ -38,10 +38,8 @@ class Home(object):
     def render(self):
         zone = CounterZone()
         zone.request = self.request
-        context = RequestContext(self.request)
-        context.update(zone.get_context_data())
         tmpl = template.loader.get_template('welco/counter_home.html')
-        return tmpl.render(context)
+        return tmpl.render(zone.get_context_data(), request=self.request)
 
 
 class CounterZone(TemplateView):
diff --git a/welco/sources/mail/views.py b/welco/sources/mail/views.py
index 7acbb89..1312781 100644
--- a/welco/sources/mail/views.py
+++ b/welco/sources/mail/views.py
@@ -36,7 +36,7 @@ def viewer(request, *args, **kwargs):
     if not 'file' in request.GET:
         return HttpResponseRedirect('?file=')
     body = template.loader.get_template('welco/mail_viewer.html').render(
-            RequestContext(request))
+            request=request)
     return HttpResponse(body)
 
 
@@ -69,7 +69,7 @@ class Home(object):
         return 'welco/mail_home.html'
 
     def render(self):
-        context = RequestContext(self.request)
+        context = {}
         context['mails'] = self.get_queryset().order_by('creation_timestamp')
         context['source_type'] = ContentType.objects.get_for_model(Mail)
         context['form'] = MailQualificationForm()
@@ -78,7 +78,7 @@ class Home(object):
             context['reject_url'] = reverse('mail-reject')
         context['display_filter'] = self.display_filter
         tmpl = template.loader.get_template(self.get_template())
-        return tmpl.render(context)
+        return tmpl.render(context, request=self.request)
 
 
 @csrf_exempt
diff --git a/welco/sources/phone/views.py b/welco/sources/phone/views.py
index 8ac3096..35a0607 100644
--- a/welco/sources/phone/views.py
+++ b/welco/sources/phone/views.py
@@ -40,12 +40,11 @@ class Home(object):
     def render(self):
         zone = PhoneZone()
         zone.request = self.request
-        context = RequestContext(self.request)
-        context.update(zone.get_context_data())
+        context = zone.get_context_data()
         # always use ajax to get list of phone calls
         del context['phonecalls']
         tmpl = template.loader.get_template('welco/phone_home.html')
-        return tmpl.render(context)
+        return tmpl.render(context, request=self.request)
 
 
 class PhoneZone(TemplateView):
diff --git a/welco/views.py b/welco/views.py
index 04c4e8b..e19ed21 100644
--- a/welco/views.py
+++ b/welco/views.py
@@ -194,10 +194,10 @@ def wcs_summary(request, *args, **kwargs):
     source_object = source_class.objects.get(id=kwargs.get('source_pk'))
     tmpl_name = 'welco/%s_summary.html' % source_class._meta.app_label
     tmpl = template.loader.get_template(tmpl_name)
-    context = RequestContext(request)
+    context = {}
     context['site_base'] = request.build_absolute_uri('/')[:-1]
     context['object'] = source_object
-    json_str = json.dumps({'content': tmpl.render(context)})
+    json_str = json.dumps({'content': tmpl.render(context, request=request)})
     for variable in ('jsonpCallback', 'callback'):
         if variable in request.GET:
             json_str = '%s(%s);' % (request.GET[variable], json_str)