Projet

Général

Profil

0002-general-misc-update-template-API-usage-for-django-1..patch

Frédéric Péters, 28 décembre 2017 09:56

Télécharger (4,83 ko)

Voir les différences: 

Subject: [PATCH 2/3] 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(-)
welco/contacts/views.py
37 37 
        self.request = request
38 38 

  		




  39
  39
  
    
    def render(self):

  		




  40
  
  
    
        context = RequestContext(self.request)

  		




  41
  40
  
    
        tmpl = template.loader.get_template('contacts/zone.html')

  		




  42
  
  
    
        return tmpl.render(context)

  		




  
  41
  
    
        return tmpl.render(request=self.request)

  		




  43
  42
  
    

  		




  44
  43
  
    

  		




  45
  44
  
    
class ContactsZone(TemplateView):

  		












  

    
      welco/kb/views.py
    
  





  225
  225
  
    
        self.request = request

  		




  226
  226
  
    

  		




  227
  227
  
    
    def render(self):

  		




  228
  
  
    
        context = RequestContext(self.request)

  		




  229
  228
  
    
        tmpl = template.loader.get_template('kb/zone.html')

  		




  230
  
  
    
        return tmpl.render(context)

  		




  
  229
  
    
        return tmpl.render(request=self.request)

  		




  231
  230
  
    

  		




  232
  231
  
    

  		




  233
  232
  
    
def kb_manager_required(view_func):

  		












  

    
      welco/sources/counter/views.py
    
  





  38
  38
  
    
    def render(self):

  		




  39
  39
  
    
        zone = CounterZone()

  		




  40
  40
  
    
        zone.request = self.request

  		




  41
  
  
    
        context = RequestContext(self.request)

  		




  42
  
  
    
        context.update(zone.get_context_data())

  		




  43
  41
  
    
        tmpl = template.loader.get_template('welco/counter_home.html')

  		




  44
  
  
    
        return tmpl.render(context)

  		




  
  42
  
    
        return tmpl.render(zone.get_context_data(), request=self.request)

  		




  45
  43
  
    

  		




  46
  44
  
    

  		




  47
  45
  
    
class CounterZone(TemplateView):

  		












  

    
      welco/sources/mail/views.py
    
  





  36
  36
  
    
    if not 'file' in request.GET:

  		




  37
  37
  
    
        return HttpResponseRedirect('?file=')

  		




  38
  38
  
    
    body = template.loader.get_template('welco/mail_viewer.html').render(

  		




  39
  
  
    
            RequestContext(request))

  		




  
  39
  
    
            request=request)

  		




  40
  40
  
    
    return HttpResponse(body)

  		




  41
  41
  
    

  		




  42
  42
  
    

  		




  ......




  69
  69
  
    
        return 'welco/mail_home.html'

  		




  70
  70
  
    

  		




  71
  71
  
    
    def render(self):

  		




  72
  
  
    
        context = RequestContext(self.request)

  		




  
  72
  
    
        context = {}

  		




  73
  73
  
    
        context['mails'] = self.get_queryset().order_by('creation_timestamp')

  		




  74
  74
  
    
        context['source_type'] = ContentType.objects.get_for_model(Mail)

  		




  75
  75
  
    
        context['form'] = MailQualificationForm()

  		




  ......




  78
  78
  
    
            context['reject_url'] = reverse('mail-reject')

  		




  79
  79
  
    
        context['display_filter'] = self.display_filter

  		




  80
  80
  
    
        tmpl = template.loader.get_template(self.get_template())

  		




  81
  
  
    
        return tmpl.render(context)

  		




  
  81
  
    
        return tmpl.render(context, request=self.request)

  		




  82
  82
  
    

  		




  83
  83
  
    

  		




  84
  84
  
    
@csrf_exempt

  		












  

    
      welco/sources/phone/views.py
    
  





  40
  40
  
    
    def render(self):

  		




  41
  41
  
    
        zone = PhoneZone()

  		




  42
  42
  
    
        zone.request = self.request

  		




  43
  
  
    
        context = RequestContext(self.request)

  		




  44
  
  
    
        context.update(zone.get_context_data())

  		




  
  43
  
    
        context = zone.get_context_data()

  		




  45
  44
  
    
        # always use ajax to get list of phone calls

  		




  46
  45
  
    
        del context['phonecalls']

  		




  47
  46
  
    
        tmpl = template.loader.get_template('welco/phone_home.html')

  		




  48
  
  
    
        return tmpl.render(context)

  		




  
  47
  
    
        return tmpl.render(context, request=self.request)

  		




  49
  48
  
    

  		




  50
  49
  
    

  		




  51
  50
  
    
class PhoneZone(TemplateView):

  		












  

    
      welco/views.py
    
  





  194
  194
  
    
    source_object = source_class.objects.get(id=kwargs.get('source_pk'))

  		




  195
  195
  
    
    tmpl_name = 'welco/%s_summary.html' % source_class._meta.app_label

  		




  196
  196
  
    
    tmpl = template.loader.get_template(tmpl_name)

  		




  197
  
  
    
    context = RequestContext(request)

  		




  
  197
  
    
    context = {}

  		




  198
  198
  
    
    context['site_base'] = request.build_absolute_uri('/')[:-1]

  		




  199
  199
  
    
    context['object'] = source_object

  		




  200
  
  
    
    json_str = json.dumps({'content': tmpl.render(context)})

  		




  
  200
  
    
    json_str = json.dumps({'content': tmpl.render(context, request=request)})

  		




  201
  201
  
    
    for variable in ('jsonpCallback', 'callback'):

  		




  202
  202
  
    
        if variable in request.GET:

  		




  203
  203
  
    
            json_str = '%s(%s);' % (request.GET[variable], json_str)

  		




  204
  
  
    
-