Skip to content

Properly return None when there's no highlight on a hit. #5944

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Jul 17, 2019
Merged

Properly return None when there's no highlight on a hit. #5944

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9fa3fd3
Properly return None when there's no highlight on a hit.
ericholscher Jul 17, 2019
b586d33
Return empty dict instead of null
ericholscher Jul 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 8 additions & 6 deletions readthedocs/search/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,14 @@ def get_inner_hits(self, obj):

def _get_inner_hits_highlights(self, hit):
"""Removes new lines from highlight and log it."""
highlight_dict = utils._remove_newlines_from_dict(
hit.highlight.to_dict()
)

log.debug('API Search highlight: %s', pformat(highlight_dict))
return highlight_dict
if hasattr(hit, 'highlight'):
highlight_dict = utils._remove_newlines_from_dict(
hit.highlight.to_dict()
)

log.debug('API Search highlight: %s', pformat(highlight_dict))
return highlight_dict
return {}


class PageSearchAPIView(generics.ListAPIView):
Expand Down