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

Revert "Don't add index.html onto htmldir docs. Fixes #252." 

This reverts commit b0dfb1f8e5.
rtd2
Eric Holscher 2012-09-26 18:22:00 -07:00
parent b0dfb1f8e5
commit 77de795a9c
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
readthedocs/core/views.py
View File

@ -302,7 +302,7 @@ class SearchView(TemplateView):
context['results'] = self.results context['results'] = self.results
context['count'] = len(self.results) # causes solr request #2 context['count'] = len(self.results) # causes solr request #2
return context return context
def get(self, request, **kwargs): def get(self, request, **kwargs):
""" """
Performing the search causes three requests to be sent to Solr. Performing the search causes three requests to be sent to Solr.

5
readthedocs/projects/views/public.py
View File

@ -166,10 +166,9 @@ def subdomain_handler(request, lang_slug=None, version_slug=None, filename=''):
This was made primarily to redirect old subdomain's to their version'd brothers. This was made primarily to redirect old subdomain's to their version'd brothers.
""" """
project = get_object_or_404(Project, slug=request.slug) if not filename:
# Don't add index.html for htmldir.
if not filename and project.documentation_type != 'sphinx_htmldir':
filename = "index.html" filename = "index.html"
project = get_object_or_404(Project, slug=request.slug)
if version_slug is None: if version_slug is None:
#Handle / on subdomain. #Handle / on subdomain.
default_version = project.get_default_version() default_version = project.get_default_version()