NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-21 03:27:21 -06:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Address feedback

Browse Source
This commit is contained in:
kkthxbye-code 2023-02-18 19:29:57 +01:00 committed by Jeremy Stretch
parent 18ea7d1e13
commit fc7cb106c1
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/extras/lookups.py
View File

@ -25,7 +25,7 @@ class NetContainsOrEquals(Lookup):
lhs, lhs_params = self.process_lhs(qn, connection) lhs, lhs_params = self.process_lhs(qn, connection)
rhs, rhs_params = self.process_rhs(qn, connection) rhs, rhs_params = self.process_rhs(qn, connection)
params = lhs_params + rhs_params params = lhs_params + rhs_params
return 'CAST(%s as inet) >>= %s' % (lhs, rhs), params return 'CAST(%s AS INET) >>= %s' % (lhs, rhs), params
CharField.register_lookup(Empty) CharField.register_lookup(Empty)

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

@ -48,7 +48,7 @@ class SearchIndex:
return FieldTypes.FLOAT return FieldTypes.FLOAT
if issubclass(field_cls, IPAddressField): if issubclass(field_cls, IPAddressField):
return FieldTypes.INET return FieldTypes.INET
if issubclass(field_cls, (IPNetworkField)): if issubclass(field_cls, IPNetworkField):
return FieldTypes.CIDR return FieldTypes.CIDR
if issubclass(field_cls, models.IntegerField): if issubclass(field_cls, models.IntegerField):
return FieldTypes.INTEGER return FieldTypes.INTEGER

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

@ -99,11 +99,12 @@ class CachedValueSearchBackend(SearchBackend):
query_filter = Q(**{f'value__{lookup}': value}) query_filter = Q(**{f'value__{lookup}': value})
if object_types:
query_filter &= Q(object_type__in=object_types)
if lookup in (LookupTypes.STARTSWITH, LookupTypes.ENDSWITH): if lookup in (LookupTypes.STARTSWITH, LookupTypes.ENDSWITH):
# Partial string matches are valid only on string values # Partial string matches are valid only on string values
query_filter &= Q(type=FieldTypes.STRING) query_filter &= Q(type=FieldTypes.STRING)
if object_types:
query_filter &= Q(object_type__in=object_types)
if lookup == LookupTypes.PARTIAL: if lookup == LookupTypes.PARTIAL:
try: try: