EbookFoundation
/
readthedocs.org
mirror of https://github.com/EbookFoundation/readthedocs.org.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Try and make index pages work on subdomain subprojects.

rtd2
Eric Holscher 2011-10-16 19:07:13 -07:00
parent 73c9c841c7
commit 5d670a97eb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
readthedocs/core/subdomain_urls.py
View File

@ -3,7 +3,7 @@ from django.conf.urls.defaults import url, patterns
from urls import urlpatterns as main_patterns
urlpatterns = patterns('',
url(r'^projects/(?P<project_slug>[\w.-]+)/(?P<lang_slug>\w{2})/(?P<version_slug>[\w.-]+)/(?P<filename>.+)$',
url(r'^projects/(?P<project_slug>[\w.-]+)/(?P<lang_slug>\w{2})/(?P<version_slug>[\w.-]+)/(?P<filename>.*)$',
'core.views.subproject_serve_docs',
name='subproject_docs_detail'
),

2
readthedocs/core/views.py
View File

@ -135,7 +135,7 @@ def legacy_serve_docs(request, username, project_slug, filename):
})
return HttpResponsePermanentRedirect(url)
def subproject_serve_docs(request, project_slug, lang_slug, version_slug, filename):
def subproject_serve_docs(request, project_slug, lang_slug, version_slug, filename=''):
parent_slug = request.slug
subproject_qs = ProjectRelationship.objects.filter(parent__slug=parent_slug, child__slug=project_slug)
if subproject_qs.exists():