From 4207cf665d2d399e9a193e38949f74c403012400 Mon Sep 17 00:00:00 2001 From: Justin Lilly Date: Tue, 1 Feb 2011 23:32:26 -0500 Subject: [PATCH] Fixes #14862 -- Broken links when visiting pages ending in /index/ --- django_website/docs/views.py | 4 ++++ django_website/urls/docs.py | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/django_website/docs/views.py b/django_website/docs/views.py index 230daad34..9d6de81d2 100644 --- a/django_website/docs/views.py +++ b/django_website/docs/views.py @@ -3,6 +3,7 @@ import datetime import django.views.static from django.core import urlresolvers +from django.http import HttpResponseRedirect from django.shortcuts import render_to_response, redirect from django.template import RequestContext from django.utils import simplejson @@ -58,6 +59,9 @@ def objects_inventory(request, lang, version): response['Content-Type'] = "text/plain" return response +def redirect_index(request, *args, **kwargs): + return HttpResponseRedirect(request.path.rstrip('index/')) + def search(request, lang, version): docroot = get_doc_root_or_404(lang, version) diff --git a/django_website/urls/docs.py b/django_website/urls/docs.py index 8fe79bc29..91fccb262 100644 --- a/django_website/urls/docs.py +++ b/django_website/urls/docs.py @@ -35,6 +35,10 @@ r'^(?P[a-z-]+)/(?P[\w.-]+)/_source/(?P.*)$', views.source, ), + url( + r'^(.*)/index/$', + views.redirect_index, + ), url( r'^(?P[a-z-]+)/(?P[\w.-]+)/(?P[\w./-]*)/$', views.document,