Fixes #6124: Location parent filter should return all child locations (not just those directly assigned)

This commit is contained in:
jeremystretch 2021-04-11 13:42:24 -04:00
parent b0573f88e6
commit 65ed047084
2 changed files with 9 additions and 5 deletions

View File

@ -18,6 +18,7 @@
* [#6107](https://github.com/netbox-community/netbox/issues/6107) - Fix rack selection field on device form
* [#6110](https://github.com/netbox-community/netbox/issues/6110) - Fix handling of TemplateColumn values for table export
* [#6123](https://github.com/netbox-community/netbox/issues/6123) - Prevent device from being assigned to mismatched site and location
* [#6124](https://github.com/netbox-community/netbox/issues/6124) - Location `parent` filter should return all child locations (not just those directly assigned)
* [#6130](https://github.com/netbox-community/netbox/issues/6130) - Improve display of assigned models in custom fields list
---

View File

@ -191,15 +191,18 @@ class LocationFilterSet(BaseFilterSet, NameSlugSearchFilterSet):
to_field_name='slug',
label='Site (slug)',
)
parent_id = django_filters.ModelMultipleChoiceFilter(
parent_id = TreeNodeMultipleChoiceFilter(
queryset=Location.objects.all(),
label='Rack group (ID)',
field_name='parent',
lookup_expr='in',
label='Location (ID)',
)
parent = django_filters.ModelMultipleChoiceFilter(
field_name='parent__slug',
parent = TreeNodeMultipleChoiceFilter(
queryset=Location.objects.all(),
field_name='parent',
lookup_expr='in',
to_field_name='slug',
label='Rack group (slug)',
label='Location (slug)',
)
class Meta: