Projet

Général

Profil

0002-misc-update-settings-to-use-TEMPLATES-20936.patch

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

Télécharger (3,35 ko)

Voir les différences:

Subject: [PATCH 2/3] misc: update settings to use TEMPLATES (#20936)

 wcs/settings.py | 50 +++++++++++++++++++++++++++-----------------------
 wcs/utils.py    |  2 +-
 2 files changed, 28 insertions(+), 24 deletions(-)
wcs/settings.py
3 3
import os
4 4

  
5 5
DEBUG = True
6
TEMPLATE_DEBUG = DEBUG
7 6

  
8 7
PROJECT_PATH = os.path.dirname(os.path.dirname(__file__))
9 8

  
......
82 81
# Make this unique, and don't share it with anybody.
83 82
SECRET_KEY = 'k16cal%1fnochq4xbxqgdns-21lt9lxeof5*%j(0ief3=db32&'
84 83

  
85
# List of callables that know how to import templates from various sources.
86
TEMPLATE_LOADERS = (
87
    'wcs.utils.TemplateLoader',
88
    'django.template.loaders.filesystem.Loader',
89
    'django.template.loaders.app_directories.Loader',
90
#     'django.template.loaders.eggs.Loader',
91
)
84
# Templates
85
TEMPLATES = [
86
    {
87
        'BACKEND': 'django.template.backends.django.DjangoTemplates',
88
        'DIRS': [
89
            os.path.join(PROJECT_PATH, 'wcs', 'templates'),
90
        ],
91
        'APP_DIRS': False,
92
        'OPTIONS': {
93
            'context_processors': [
94
                "django.template.context_processors.debug",
95
                "django.template.context_processors.i18n",
96
                "django.template.context_processors.media",
97
                "django.template.context_processors.static",
98
                "django.template.context_processors.tz",
99
                "django.contrib.messages.context_processors.messages",
100
                "wcs.context_processors.publisher",
101
                "wcs.context_processors.response",
102
            ],
103
            'loaders': [
104
                'wcs.utils.TemplateLoader',
105
                'django.template.loaders.filesystem.Loader',
106
                'django.template.loaders.app_directories.Loader',
107
            ],
108
        },
109
    },
110
]
92 111

  
93 112
MIDDLEWARE_CLASSES = (
94 113
    'django.middleware.common.CommonMiddleware',
......
108 127
# Python dotted path to the WSGI application used by Django's runserver.
109 128
WSGI_APPLICATION = 'wcs.wsgi.application'
110 129

  
111
TEMPLATE_DIRS = (
112
    os.path.join(PROJECT_PATH, 'wcs', 'templates'),
113
)
114

  
115
TEMPLATE_CONTEXT_PROCESSORS = (
116
    "django.core.context_processors.debug",
117
    "django.core.context_processors.i18n",
118
    "django.core.context_processors.media",
119
    "django.core.context_processors.static",
120
    "django.core.context_processors.tz",
121
    "django.contrib.messages.context_processors.messages",
122
    "wcs.context_processors.publisher",
123
    "wcs.context_processors.response",
124
)
125

  
126 130
INSTALLED_APPS = (
127 131
    #'django.contrib.auth',
128 132
    #'django.contrib.contenttypes',
wcs/utils.py
51 51

  
52 52
                template_dirs.append(theme_directory)
53 53

  
54
            template_dirs = tuple(template_dirs) + settings.TEMPLATE_DIRS
54
            template_dirs = tuple(template_dirs)
55 55

  
56 56
        return super(TemplateLoader, self).get_template_sources(template_name, template_dirs)
57
-