From e7157973e717653b67ee4c6709cf8d8be5ac149b Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 8 Mar 2021 16:51:11 -0500 Subject: [PATCH] Fixes #5922: Fix options for filtering object permissions in admin UI --- docs/release-notes/version-2.10.md | 1 + netbox/users/admin.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/release-notes/version-2.10.md b/docs/release-notes/version-2.10.md index 529f52a1a..f00e38476 100644 --- a/docs/release-notes/version-2.10.md +++ b/docs/release-notes/version-2.10.md @@ -13,6 +13,7 @@ * [#5703](https://github.com/netbox-community/netbox/issues/5703) - Fix VRF and Tenant field population when adding IP addresses from prefix * [#5819](https://github.com/netbox-community/netbox/issues/5819) - Enable ordering of virtual machines by primary IP address * [#5872](https://github.com/netbox-community/netbox/issues/5872) - Ordering of devices by primary IP should respect PREFER_IPV4 configuration parameter +* [#5922](https://github.com/netbox-community/netbox/issues/5922) - Fix options for filtering object permissions in admin UI * [#5935](https://github.com/netbox-community/netbox/issues/5935) - Fix filtering prefixes list by multiple prefix values ## v2.10.5 (2021-02-24) diff --git a/netbox/users/admin.py b/netbox/users/admin.py index f2fe4a0b4..e1625e1ed 100644 --- a/netbox/users/admin.py +++ b/netbox/users/admin.py @@ -223,7 +223,7 @@ class ObjectTypeListFilter(admin.SimpleListFilter): parameter_name = 'object_type' def lookups(self, request, model_admin): - object_types = ObjectPermission.objects.values_list('id', flat=True).distinct() + object_types = ObjectPermission.objects.values_list('object_types__pk', flat=True).distinct() content_types = ContentType.objects.filter(pk__in=object_types).order_by('app_label', 'model') return [ (ct.pk, ct) for ct in content_types