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

Properly handle project 404 pages

refactor-builder
Eric Holscher 2014-01-22 07:03:51 +07:00
parent 6fb894144a
commit 349798927d
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
readthedocs/core/views.py
View File

@ -274,7 +274,10 @@ def default_docs_kwargs(request, project_slug=None):
proj = Project.objects.get(slug=project_slug)
except (Project.DoesNotExist, ValueError):
# Try with underscore, for legacy
proj = Project.objects.get(slug=project_slug.replace('-', '_'))
try:
proj = Project.objects.get(slug=project_slug.replace('-', '_'))
except (Project.DoesNotExist):
proj = None
else:
# If project_slug isn't in URL pattern, it's set in subdomain
# middleware as request.slug.
@ -282,7 +285,10 @@ def default_docs_kwargs(request, project_slug=None):
proj = Project.objects.get(slug=request.slug)
except (Project.DoesNotExist, ValueError):
# Try with underscore, for legacy
proj = Project.objects.get(slug=request.slug.replace('-', '_'))
try:
proj = Project.objects.get(slug=request.slug.replace('-', '_'))
except (Project.DoesNotExist):
proj = None
if not proj:
raise Http404("Project slug not found")
version_slug = proj.get_default_version()