Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Check for two paths for each file #5370

Merged
merged 4 commits into from Feb 28, 2019
Merged

Check for two paths for each file #5370

merged 4 commits into from Feb 28, 2019

Conversation

@ericholscher
Copy link
Member

@ericholscher ericholscher commented Feb 27, 2019

This is because HTMLDir can generate a file from two different places:

  • foo.rst
  • foo/index.rst

Both lead to foo/index.html

fixes #5368

This is because HTMLDir can generate a file from two different places:

* foo.rst
* foo/index.rst

Both lead to `foo/index.html`

refs #5368
@ericholscher ericholscher requested a review from stsewd Feb 27, 2019
stsewd
stsewd approved these changes Feb 27, 2019
Copy link
Member

@stsewd stsewd left a comment

Sad we can't use this solution for the footer api :/ (or maybe we can, not sure if we have access to the file system)

readthedocs/projects/models.py Show resolved Hide resolved
@ericholscher
Copy link
Member Author

@ericholscher ericholscher commented Feb 27, 2019

Yea, the footer should have FS access, but we're talking about having that go away here soon too :/

@stsewd
Copy link
Member

@stsewd stsewd commented Feb 28, 2019

but we're talking about having that go away here soon too

Do you mean the footer api? but the version selector is great!

@ericholscher
Copy link
Member Author

@ericholscher ericholscher commented Feb 28, 2019

No, the filesystem access on the webs :)

@ericholscher
Copy link
Member Author

@ericholscher ericholscher commented Feb 28, 2019

Works locally:

screenshot 2019-02-27 21 10 23

@stsewd
Copy link
Member

@stsewd stsewd commented Feb 28, 2019

You should check the api response, because when we don't have results, we fallback to sphinx. But it should work with this logic.

@ericholscher ericholscher merged commit bdacceb into master Feb 28, 2019
2 checks passed
@delete-merged-branch delete-merged-branch bot deleted the fix-htmldir-search-index branch Feb 28, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

2 participants