pass test

This commit is contained in:
xxc 2017-04-21 11:54:37 +08:00
parent 1b7d14a1fc
commit 9110e46387
4 changed files with 14 additions and 6 deletions

View file

@ -49,6 +49,7 @@ class CodeMirrorTextArea(forms.Textarea):
""" % dict(media_prefix=settings.DBTEMPLATES_MEDIA_PREFIX, name=name))
return mark_safe(u"".join(result))
if settings.DBTEMPLATES_USE_CODEMIRROR:
TemplateContentTextArea = CodeMirrorTextArea
else:
@ -161,4 +162,5 @@ class TemplateAdmin(TemplateModelAdmin):
return ", ".join([site.name for site in template.sites.all()])
site_list.short_description = _('sites')
admin.site.register(Template, TemplateAdmin)

View file

@ -1,19 +1,22 @@
from django.utils.deprecation import MiddlewareMixin
try:
from django.utils.deprecation import MiddlewareMixin
except ImportError:
class MiddlewareMixin(object):
pass
_request = []
_request = [None]
class RecordRequestMiddleware(MiddlewareMixin):
def process_request(self, request):
_request.append(request)
_request[0] = request
def process_response(self, request, response):
_request.pop()
_request[0] = None
return response
def get_request():
if _request:
return _request[0]
return None
return None

View file

@ -12,6 +12,7 @@ from django.utils.translation import ugettext_lazy as _
from django.utils.timezone import now
from .middleware import get_request
class Template(models.Model):
"""
Defines a template model for use with the database template loader.

View file

@ -5,6 +5,7 @@ from django.template.defaultfilters import slugify
from dbtemplates.conf import settings
from ..middleware import get_request
def get_cache_backend():
"""
Compatibilty wrapper for getting Django's cache backend instance
@ -17,6 +18,7 @@ def get_cache_backend():
signals.request_finished.connect(cache.close)
return cache
cache = get_cache_backend()