mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

#11516: Tweak fix to ensure proper highlighting

Browse Source
This commit is contained in:
jeremystretch
2023-01-20 13:43:47 -05:00
parent fcd0481b09
commit 5911041777
2 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
netbox/netbox/views/misc.py
View File

@ -1,3 +1,4 @@
import re
from collections import namedtuple from collections import namedtuple
from django.conf import settings from django.conf import settings
@ -160,7 +161,13 @@ class SearchView(View):
lookup=lookup lookup=lookup
) )
if form.cleaned_data['lookup'] != LookupTypes.EXACT: # If performing a regex search, pass the highlight value as a compiled pattern
if form.cleaned_data['lookup'] == LookupTypes.REGEX:
try:
highlight = re.compile(f"({form.cleaned_data['q']})", flags=re.IGNORECASE)
except re.error:
pass
elif form.cleaned_data['lookup'] != LookupTypes.EXACT:
highlight = form.cleaned_data['q'] highlight = form.cleaned_data['q']
table = SearchTable(results, highlight=highlight) table = SearchTable(results, highlight=highlight)

14
netbox/utilities/utils.py
View File

@ -514,11 +514,21 @@ def clean_html(html, schemes):
def highlight_string(value, highlight, trim_pre=None, trim_post=None, trim_placeholder='...'): def highlight_string(value, highlight, trim_pre=None, trim_post=None, trim_placeholder='...'):
""" """
Highlight a string within a string and optionally trim the pre/post portions of the original string. Highlight a string within a string and optionally trim the pre/post portions of the original string.
Args:
value: The body of text being searched against
highlight: The string of compiled regex pattern to highlight in `value`
trim_pre: Maximum length of pre-highlight text to include
trim_post: Maximum length of post-highlight text to include
trim_placeholder: String value to swap in for trimmed pre/post text
""" """
# Split value on highlight string # Split value on highlight string
try: try:
pre, match, post = re.split(fr'({re.escape(highlight)})', value, maxsplit=1, flags=re.IGNORECASE) if type(highlight) is re.Pattern:
except ValueError: pre, match, post = highlight.split(value, maxsplit=1)
else:
pre, match, post = re.split(fr'({highlight})', value, maxsplit=1, flags=re.IGNORECASE)
except ValueError as e:
# Match not found # Match not found
return escape(value) return escape(value)