Projet

Général

Profil

0001-misc-update-to-use-new-TEMPLATES-settings-19578.patch

Frédéric Péters, 20 octobre 2017 10:20

Télécharger (2,64 ko)

Voir les différences: 

Subject: [PATCH] misc: update to use new TEMPLATES settings (#19578)


 combo/settings.py | 31 ++++++++++++++++++++++++-------
 combo/wsgi.py     |  2 +-
 2 files changed, 25 insertions(+), 8 deletions(-)
combo/settings.py
41 41 
# SECURITY WARNING: don't run with debug turned on in production!
42 42 
DEBUG = True
43 43 

  		




  44
  
  
    
TEMPLATE_DEBUG = True

  		




  45
  
  
    

  		




  46
  44
  
    
ALLOWED_HOSTS = []

  		




  47
  45
  
    

  		




  48
  46
  
    

  		




  ......




  100
  98
  
    
)

  		




  101
  99
  
    

  		




  102
  100
  
    
# Serve xstatic files, required for gadjo

  		




  103
  
  
    
STATICFILES_FINDERS = global_settings.STATICFILES_FINDERS + \

  		




  104
  
  
    
            ('gadjo.finders.XStaticFinder',)

  		




  105
  
  
    

  		




  106
  
  
    
TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + \

  		




  107
  
  
    
            ('combo.context_processors.template_vars',)

  		




  
  101
  
    
STATICFILES_FINDERS = list(global_settings.STATICFILES_FINDERS) + \

  		




  
  102
  
    
            ['gadjo.finders.XStaticFinder']

  		




  
  103
  
    

  		




  
  104
  
    
# Templates

  		




  
  105
  
    
TEMPLATES = [

  		




  
  106
  
    
    {

  		




  
  107
  
    
        'BACKEND': 'django.template.backends.django.DjangoTemplates',

  		




  
  108
  
    
        'DIRS': [

  		




  
  109
  
    
        ],

  		




  
  110
  
    
        'APP_DIRS': True,

  		




  
  111
  
    
        'OPTIONS': {

  		




  
  112
  
    
            'context_processors': [

  		




  
  113
  
    
                'django.contrib.auth.context_processors.auth',

  		




  
  114
  
    
                'django.template.context_processors.debug',

  		




  
  115
  
    
                'django.template.context_processors.i18n',

  		




  
  116
  
    
                'django.template.context_processors.media',

  		




  
  117
  
    
                'django.template.context_processors.static',

  		




  
  118
  
    
                'django.template.context_processors.tz',

  		




  
  119
  
    
                'django.contrib.messages.context_processors.messages',

  		




  
  120
  
    
                'combo.context_processors.template_vars',

  		




  
  121
  
    
            ],

  		




  
  122
  
    
        },

  		




  
  123
  
    
    },

  		




  
  124
  
    
]

  		




  108
  125
  
    

  		




  109
  126
  
    
ROOT_URLCONF = 'combo.urls'

  		




  110
  127
  
    

  		












  

    
      combo/wsgi.py
    
  





  13
  13
  
    
from django.conf import settings

  		




  14
  14
  
    
from django.core.wsgi import get_wsgi_application

  		




  15
  15
  
    
application = get_wsgi_application()

  		




  16
  
  
    
if 'hobo.context_processors.statics_hash' in settings.TEMPLATE_CONTEXT_PROCESSORS:

  		




  
  16
  
    
if 'hobo.context_processors.statics_hash' in settings.TEMPLATES[0]['OPTIONS']['context_processors']:

  		




  17
  17
  
    
    # initialize versions as soon as possible as it may be used in most

  		




  18
  18
  
    
    # requests via the statics_hash template var and we prefer not to

  		




  19
  19
  
    
    # load the information during a user request.

  		




  20
  
  
    
-