From af778f8fcafc29846cd14dde4b466ffeff86c6b7 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 29 Jun 2020 15:36:02 -0400 Subject: [PATCH] TagFilter should call unrestricted() on its queryset --- netbox/utilities/filters.py | 2 +- netbox/utilities/forms.py | 2 +- netbox/utilities/tables.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/netbox/utilities/filters.py b/netbox/utilities/filters.py index f628ca917..b13c55f40 100644 --- a/netbox/utilities/filters.py +++ b/netbox/utilities/filters.py @@ -102,7 +102,7 @@ class TagFilter(django_filters.ModelMultipleChoiceFilter): kwargs.setdefault('field_name', 'tags__slug') kwargs.setdefault('to_field_name', 'slug') kwargs.setdefault('conjoined', True) - kwargs.setdefault('queryset', Tag.objects.all()) + kwargs.setdefault('queryset', Tag.objects.unrestricted()) super().__init__(*args, **kwargs) diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py index 0d15d34df..b2ce1592a 100644 --- a/netbox/utilities/forms.py +++ b/netbox/utilities/forms.py @@ -596,7 +596,7 @@ class TagFilterField(forms.MultipleChoiceField): def __init__(self, model, *args, **kwargs): def get_choices(): - tags = model.tags.annotate( + tags = model.tags.all().unrestricted().annotate( count=Count('extras_taggeditem_items') ).order_by('name') return [ diff --git a/netbox/utilities/tables.py b/netbox/utilities/tables.py index 10e408b43..5e277e633 100644 --- a/netbox/utilities/tables.py +++ b/netbox/utilities/tables.py @@ -151,7 +151,7 @@ class TagColumn(tables.TemplateColumn): Display a list of tags assigned to the object. """ template_code = """ - {% for tag in value.all %} + {% for tag in value.all.unrestricted %} {% include 'utilities/templatetags/tag.html' %} {% empty %}