general: misc update template API usage for django 1.11 (#20909)
This commit is contained in:
parent
4bf8c455ab
commit
9b1fe45772
|
@ -37,9 +37,8 @@ class HomeZone(object):
|
||||||
self.request = request
|
self.request = request
|
||||||
|
|
||||||
def render(self):
|
def render(self):
|
||||||
context = RequestContext(self.request)
|
|
||||||
tmpl = template.loader.get_template('contacts/zone.html')
|
tmpl = template.loader.get_template('contacts/zone.html')
|
||||||
return tmpl.render(context)
|
return tmpl.render(request=self.request)
|
||||||
|
|
||||||
|
|
||||||
class ContactsZone(TemplateView):
|
class ContactsZone(TemplateView):
|
||||||
|
|
|
@ -225,9 +225,8 @@ class HomeZone(object):
|
||||||
self.request = request
|
self.request = request
|
||||||
|
|
||||||
def render(self):
|
def render(self):
|
||||||
context = RequestContext(self.request)
|
|
||||||
tmpl = template.loader.get_template('kb/zone.html')
|
tmpl = template.loader.get_template('kb/zone.html')
|
||||||
return tmpl.render(context)
|
return tmpl.render(request=self.request)
|
||||||
|
|
||||||
|
|
||||||
def kb_manager_required(view_func):
|
def kb_manager_required(view_func):
|
||||||
|
|
|
@ -38,10 +38,8 @@ class Home(object):
|
||||||
def render(self):
|
def render(self):
|
||||||
zone = CounterZone()
|
zone = CounterZone()
|
||||||
zone.request = self.request
|
zone.request = self.request
|
||||||
context = RequestContext(self.request)
|
|
||||||
context.update(zone.get_context_data())
|
|
||||||
tmpl = template.loader.get_template('welco/counter_home.html')
|
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):
|
class CounterZone(TemplateView):
|
||||||
|
|
|
@ -36,7 +36,7 @@ def viewer(request, *args, **kwargs):
|
||||||
if not 'file' in request.GET:
|
if not 'file' in request.GET:
|
||||||
return HttpResponseRedirect('?file=')
|
return HttpResponseRedirect('?file=')
|
||||||
body = template.loader.get_template('welco/mail_viewer.html').render(
|
body = template.loader.get_template('welco/mail_viewer.html').render(
|
||||||
RequestContext(request))
|
request=request)
|
||||||
return HttpResponse(body)
|
return HttpResponse(body)
|
||||||
|
|
||||||
|
|
||||||
|
@ -69,7 +69,7 @@ class Home(object):
|
||||||
return 'welco/mail_home.html'
|
return 'welco/mail_home.html'
|
||||||
|
|
||||||
def render(self):
|
def render(self):
|
||||||
context = RequestContext(self.request)
|
context = {}
|
||||||
context['mails'] = self.get_queryset().order_by('creation_timestamp')
|
context['mails'] = self.get_queryset().order_by('creation_timestamp')
|
||||||
context['source_type'] = ContentType.objects.get_for_model(Mail)
|
context['source_type'] = ContentType.objects.get_for_model(Mail)
|
||||||
context['form'] = MailQualificationForm()
|
context['form'] = MailQualificationForm()
|
||||||
|
@ -78,7 +78,7 @@ class Home(object):
|
||||||
context['reject_url'] = reverse('mail-reject')
|
context['reject_url'] = reverse('mail-reject')
|
||||||
context['display_filter'] = self.display_filter
|
context['display_filter'] = self.display_filter
|
||||||
tmpl = template.loader.get_template(self.get_template())
|
tmpl = template.loader.get_template(self.get_template())
|
||||||
return tmpl.render(context)
|
return tmpl.render(context, request=self.request)
|
||||||
|
|
||||||
|
|
||||||
@csrf_exempt
|
@csrf_exempt
|
||||||
|
|
|
@ -40,12 +40,11 @@ class Home(object):
|
||||||
def render(self):
|
def render(self):
|
||||||
zone = PhoneZone()
|
zone = PhoneZone()
|
||||||
zone.request = self.request
|
zone.request = self.request
|
||||||
context = RequestContext(self.request)
|
context = zone.get_context_data()
|
||||||
context.update(zone.get_context_data())
|
|
||||||
# always use ajax to get list of phone calls
|
# always use ajax to get list of phone calls
|
||||||
del context['phonecalls']
|
del context['phonecalls']
|
||||||
tmpl = template.loader.get_template('welco/phone_home.html')
|
tmpl = template.loader.get_template('welco/phone_home.html')
|
||||||
return tmpl.render(context)
|
return tmpl.render(context, request=self.request)
|
||||||
|
|
||||||
|
|
||||||
class PhoneZone(TemplateView):
|
class PhoneZone(TemplateView):
|
||||||
|
|
|
@ -194,10 +194,10 @@ def wcs_summary(request, *args, **kwargs):
|
||||||
source_object = source_class.objects.get(id=kwargs.get('source_pk'))
|
source_object = source_class.objects.get(id=kwargs.get('source_pk'))
|
||||||
tmpl_name = 'welco/%s_summary.html' % source_class._meta.app_label
|
tmpl_name = 'welco/%s_summary.html' % source_class._meta.app_label
|
||||||
tmpl = template.loader.get_template(tmpl_name)
|
tmpl = template.loader.get_template(tmpl_name)
|
||||||
context = RequestContext(request)
|
context = {}
|
||||||
context['site_base'] = request.build_absolute_uri('/')[:-1]
|
context['site_base'] = request.build_absolute_uri('/')[:-1]
|
||||||
context['object'] = source_object
|
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'):
|
for variable in ('jsonpCallback', 'callback'):
|
||||||
if variable in request.GET:
|
if variable in request.GET:
|
||||||
json_str = '%s(%s);' % (request.GET[variable], json_str)
|
json_str = '%s(%s);' % (request.GET[variable], json_str)
|
||||||
|
|
Loading…
Reference in New Issue