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

Closes #6189: Add ability to search for locations by name or description

This commit is contained in:
jeremystretch
2021-04-19 15:56:39 -04:00
parent a2d16143e3
commit 620d222f98
3 changed files with 16 additions and 0 deletions

View File

@ -2,6 +2,10 @@
## v2.11.1 (FUTURE) ## v2.11.1 (FUTURE)
### Enhancements
* [#6189](https://github.com/netbox-community/netbox/issues/6189) - Add ability to search for locations by name or description
### Bug Fixes ### Bug Fixes
* [#6184](https://github.com/netbox-community/netbox/issues/6184) - Fix parent object table column in prefix IP addresses list * [#6184](https://github.com/netbox-community/netbox/issues/6184) - Fix parent object table column in prefix IP addresses list

View File

@ -209,6 +209,14 @@ class LocationFilterSet(BaseFilterSet, NameSlugSearchFilterSet):
model = Location model = Location
fields = ['id', 'name', 'slug', 'description'] fields = ['id', 'name', 'slug', 'description']
def search(self, queryset, name, value):
if not value.strip():
return queryset
return queryset.filter(
Q(name__icontains=value) |
Q(description__icontains=value)
)
class RackRoleFilterSet(BaseFilterSet, NameSlugSearchFilterSet): class RackRoleFilterSet(BaseFilterSet, NameSlugSearchFilterSet):

View File

@ -559,6 +559,10 @@ class LocationBulkEditForm(BootstrapMixin, CustomFieldBulkEditForm):
class LocationFilterForm(BootstrapMixin, CustomFieldFilterForm): class LocationFilterForm(BootstrapMixin, CustomFieldFilterForm):
model = Location model = Location
q = forms.CharField(
required=False,
label=_('Search')
)
region_id = DynamicModelMultipleChoiceField( region_id = DynamicModelMultipleChoiceField(
queryset=Region.objects.all(), queryset=Region.objects.all(),
required=False, required=False,