NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-25 00:36:11 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Enable specifying lookup logic

Browse Source
This commit is contained in:
jeremystretch 2022-10-17 16:28:26 -04:00
parent bcc5f6c504
commit eb1557c171
4 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
netbox/netbox/forms/__init__.py
View File

@ -1,10 +1,19 @@
from django import forms from django import forms
from django.utils.translation import gettext as _
from netbox.search import LookupTypes
from netbox.search.backends import search_backend from netbox.search.backends import search_backend
from utilities.forms import BootstrapMixin, StaticSelectMultiple from utilities.forms import BootstrapMixin, StaticSelect, StaticSelectMultiple
from .base import * from .base import *
LOOKUP_CHOICES = (
('', _('Partial match')),
(LookupTypes.EXACT, _('Exact match')),
(LookupTypes.STARTSWITH, _('Starts with')),
(LookupTypes.ENDSWITH, _('Ends with')),
)
def build_options(choices): def build_options(choices):
options = [{"label": choices[0][1], "items": []}] options = [{"label": choices[0][1], "items": []}]
@ -27,6 +36,13 @@ class SearchForm(BootstrapMixin, forms.Form):
label='Object type(s)', label='Object type(s)',
widget=StaticSelectMultiple() widget=StaticSelectMultiple()
) )
lookup = forms.ChoiceField(
choices=LOOKUP_CHOICES,
initial=LookupTypes.PARTIAL,
required=False,
widget=StaticSelect()
)
options = None options = None
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):

2
netbox/netbox/search/__init__.py
View File

@ -14,8 +14,8 @@ class FieldTypes:
class LookupTypes: class LookupTypes:
EXACT = 'iexact'
PARTIAL = 'icontains' PARTIAL = 'icontains'
EXACT = 'iexact'
STARTSWITH = 'istartswith' STARTSWITH = 'istartswith'
ENDSWITH = 'iendswith' ENDSWITH = 'iendswith'

4
netbox/netbox/search/backends.py
View File

@ -161,7 +161,9 @@ class FilterSetSearchBackend(SearchBackend):
class CachedValueSearchBackend(SearchBackend): class CachedValueSearchBackend(SearchBackend):
def search(self, request, value, object_types=None, lookup=DEFAULT_LOOKUP_TYPE): def search(self, request, value, object_types=None, lookup=None):
if not lookup:
lookup = DEFAULT_LOOKUP_TYPE
# Define the search parameters # Define the search parameters
params = { params = {

7
netbox/netbox/views/__init__.py
View File

@ -163,7 +163,12 @@ class SearchView(View):
app_label, model_name = obj_type.split('.') app_label, model_name = obj_type.split('.')
object_types.append(ContentType.objects.get_by_natural_key(app_label, model_name)) object_types.append(ContentType.objects.get_by_natural_key(app_label, model_name))
results = search_backend.search(request, form.cleaned_data['q'], object_types=object_types) results = search_backend.search(
request,
form.cleaned_data['q'],
object_types=object_types,
lookup=form.cleaned_data['lookup']
)
return render(request, 'search.html', { return render(request, 'search.html', {
'form': form, 'form': form,