测试gitnore
This commit is contained in:
@@ -7,7 +7,7 @@ from django.template import loader
|
||||
from django.utils.safestring import mark_safe
|
||||
from django.views.decorators.csrf import csrf_protect
|
||||
|
||||
DEFAULT_TEMPLATE = "flatpages/default.html"
|
||||
DEFAULT_TEMPLATE = 'flatpages/default.html'
|
||||
|
||||
# This view is called from FlatpageFallbackMiddleware.process_response
|
||||
# when a 404 is raised, which often means CsrfViewMiddleware.process_view
|
||||
@@ -30,16 +30,16 @@ def flatpage(request, url):
|
||||
flatpage
|
||||
`flatpages.flatpages` object
|
||||
"""
|
||||
if not url.startswith("/"):
|
||||
url = "/" + url
|
||||
if not url.startswith('/'):
|
||||
url = '/' + url
|
||||
site_id = get_current_site(request).id
|
||||
try:
|
||||
f = get_object_or_404(FlatPage, url=url, sites=site_id)
|
||||
except Http404:
|
||||
if not url.endswith("/") and settings.APPEND_SLASH:
|
||||
url += "/"
|
||||
if not url.endswith('/') and settings.APPEND_SLASH:
|
||||
url += '/'
|
||||
f = get_object_or_404(FlatPage, url=url, sites=site_id)
|
||||
return HttpResponsePermanentRedirect("%s/" % request.path)
|
||||
return HttpResponsePermanentRedirect('%s/' % request.path)
|
||||
else:
|
||||
raise
|
||||
return render_flatpage(request, f)
|
||||
@@ -54,7 +54,6 @@ def render_flatpage(request, f):
|
||||
# logged in, redirect to the login page.
|
||||
if f.registration_required and not request.user.is_authenticated:
|
||||
from django.contrib.auth.views import redirect_to_login
|
||||
|
||||
return redirect_to_login(request.path)
|
||||
if f.template_name:
|
||||
template = loader.select_template((f.template_name, DEFAULT_TEMPLATE))
|
||||
@@ -67,4 +66,4 @@ def render_flatpage(request, f):
|
||||
f.title = mark_safe(f.title)
|
||||
f.content = mark_safe(f.content)
|
||||
|
||||
return HttpResponse(template.render({"flatpage": f}, request))
|
||||
return HttpResponse(template.render({'flatpage': f}, request))
|
||||
|
||||
Reference in New Issue
Block a user