app/django/contrib/flatpages/views.py
changeset 323 ff1a9aa48cfd
parent 54 03e267d67478
equal deleted inserted replaced
322:6641e941ef1e 323:ff1a9aa48cfd
     1 from django.contrib.flatpages.models import FlatPage
     1 from django.contrib.flatpages.models import FlatPage
     2 from django.template import loader, RequestContext
     2 from django.template import loader, RequestContext
     3 from django.shortcuts import get_object_or_404
     3 from django.shortcuts import get_object_or_404
     4 from django.http import HttpResponse
     4 from django.http import HttpResponse, HttpResponseRedirect
     5 from django.conf import settings
     5 from django.conf import settings
     6 from django.core.xheaders import populate_xheaders
     6 from django.core.xheaders import populate_xheaders
     7 from django.utils.safestring import mark_safe
     7 from django.utils.safestring import mark_safe
     8 
     8 
     9 DEFAULT_TEMPLATE = 'flatpages/default.html'
     9 DEFAULT_TEMPLATE = 'flatpages/default.html'
    17         or `flatpages/default.html` if template_name is not defined.
    17         or `flatpages/default.html` if template_name is not defined.
    18     Context:
    18     Context:
    19         flatpage
    19         flatpage
    20             `flatpages.flatpages` object
    20             `flatpages.flatpages` object
    21     """
    21     """
       
    22     if not url.endswith('/') and settings.APPEND_SLASH:
       
    23         return HttpResponseRedirect("%s/" % request.path)
    22     if not url.startswith('/'):
    24     if not url.startswith('/'):
    23         url = "/" + url
    25         url = "/" + url
    24     f = get_object_or_404(FlatPage, url__exact=url, sites__id__exact=settings.SITE_ID)
    26     f = get_object_or_404(FlatPage, url__exact=url, sites__id__exact=settings.SITE_ID)
    25     # If registration is required for accessing this page, and the user isn't
    27     # If registration is required for accessing this page, and the user isn't
    26     # logged in, redirect to the login page.
    28     # logged in, redirect to the login page.