Projet

Général

Profil

0003-misc-update-context-usage-for-django-1.11-20936.patch

Frédéric Péters, 01 janvier 2018 12:43

Télécharger (3,75 ko)

Voir les différences: 

Subject: [PATCH 3/3] misc: update context usage for django 1.11 (#20936)


 wcs/compat.py       | 6 +++---
 wcs/forms/common.py | 9 +++------
 wcs/qommon/form.py  | 3 +--
 3 files changed, 7 insertions(+), 11 deletions(-)
wcs/compat.py
26 26 

  		




  27
  27
  
    
from django.http import HttpResponse

  		




  28
  28
  
    
from django.conf import settings

  		




  29
  
  
    
from django.template import loader, RequestContext, TemplateDoesNotExist

  		




  
  29
  
    
from django.template import loader, TemplateDoesNotExist

  		




  30
  30
  
    
from django.template.response import TemplateResponse

  		




  31
  31
  
    
from django.views.generic.base import TemplateView

  		




  32
  32
  
    

  		




  ......




  158
  158
  
    
            return self.render_response(output)

  		




  159
  159
  
    

  		




  160
  160
  
    
        template_name = 'wcs/base.html'

  		




  161
  
  
    
        vars = template.get_decorate_vars(output, response)

  		




  162
  
  
    
        context = RequestContext(request.django_request, vars)

  		




  
  161
  
    
        context = template.get_decorate_vars(output, response)

  		




  
  162
  
    
        context['request'] = request.django_request

  		




  163
  163
  
    
        django_response = TemplateResponse(request.django_request,

  		




  164
  164
  
    
                template_name,

  		




  165
  165
  
    
                context,

  		












  

    
      wcs/forms/common.py
    
  





  25
  25
  
    
from wcs.fields import WidgetField, FileField

  		




  26
  26
  
    
from wcs.workflows import EditableWorkflowStatusItem

  		




  27
  27
  
    

  		




  28
  
  
    
from django.template import RequestContext

  		




  29
  
  
    

  		




  30
  28
  
    
from qommon import _

  		




  31
  29
  
    
from qommon import misc

  		




  32
  30
  
    
from qommon import template

  		




  ......




  226
  224
  
    
                return "Your browser should redirect you"

  		




  227
  225
  
    

  		




  228
  226
  
    
        self.html_top(self.formdef.name)

  		




  229
  
  
    
        context = RequestContext(get_request().django_request, {

  		




  
  227
  
    
        context = {

  		




  230
  228
  
    
            'view': self,

  		




  231
  229
  
    
            'mine': mine,

  		




  232
  230
  
    
            'formdata': self.filled,

  		




  233
  231
  
    
            'workflow_form': form,

  		




  234
  
  
    
        })

  		




  
  232
  
    
        }

  		




  235
  233
  
    

  		




  236
  234
  
    
        return template.render(self.status_templates, context)

  		




  237
  235
  
    

  		




  ......




  245
  243
  
    
        if not self.formdef.is_user_allowed_read_status_and_history(get_request().user, self.filled):

  		




  246
  244
  
    
            return

  		




  247
  245
  
    

  		




  248
  
  
    
        context = RequestContext(get_request().django_request, {'formdata': self.filled})

  		




  249
  
  
    
        return template.render(self.history_templates, context)

  		




  
  246
  
    
        return template.render(self.history_templates, {'formdata': self.filled})

  		




  250
  247
  
    

  		




  251
  248
  
    
    def check_receiver(self):

  		




  252
  249
  
    
        session = get_session()

  		












  

    
      wcs/qommon/form.py
    
  





  62
  62
  
    
from quixote.html import htmltext, htmltag, htmlescape, TemplateIO

  		




  63
  63
  
    
from quixote.util import randbytes

  		




  64
  64
  
    

  		




  65
  
  
    
from django.template import RequestContext

  		




  66
  65
  
    
from django.utils.safestring import mark_safe

  		




  67
  66
  
    

  		




  68
  67
  
    
from .template import render as render_template, Template, TemplateError

  		




  ......




  124
  123
  
    
    self.rendered_error = lambda: safe(self.render_error(self.get_error()))

  		




  125
  124
  
    
    self.rendered_hint = lambda: safe(self.render_hint(self.get_hint()))

  		




  126
  125
  
    
    self.rendered_message = lambda: safe(self.render_message(self.get_message()))

  		




  127
  
  
    
    context = RequestContext(get_request().django_request, {'widget': self})

  		




  
  126
  
    
    context = {'widget': self}

  		




  128
  127
  
    
    template_names = []

  		




  129
  128
  
    
    widget_template_name = getattr(self, 'template_name', None)

  		




  130
  129
  
    
    for extra_css_class in (getattr(self, 'extra_css_class', '') or '').split():

  		




  131
  
  
    
-