From e4dab0ba5032262e33a93697ad07c2b2ec2d1a34 Mon Sep 17 00:00:00 2001 From: Julio-Oliveira-Encora Date: Tue, 28 May 2024 15:08:34 -0300 Subject: [PATCH 1/3] Replaced "api=/api/extras/content-types/" with "/api/extras/object-types/" for JournalEntryFilterForm and ObjectChangeFilterForm. --- netbox/extras/forms/filtersets.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/extras/forms/filtersets.py b/netbox/extras/forms/filtersets.py index d4235c46545..b80d7b346ea 100644 --- a/netbox/extras/forms/filtersets.py +++ b/netbox/extras/forms/filtersets.py @@ -469,7 +469,7 @@ class JournalEntryFilterForm(NetBoxModelFilterSetForm): required=False, label=_('Object Type'), widget=APISelectMultiple( - api_url='/api/extras/content-types/', + api_url='/api/extras/object-types/', ) ) kind = forms.ChoiceField( @@ -512,6 +512,6 @@ class ObjectChangeFilterForm(SavedFiltersMixin, FilterForm): required=False, label=_('Object Type'), widget=APISelectMultiple( - api_url='/api/extras/content-types/', + api_url='/api/extras/object-types/', ) ) From 8ebc2adc985c9496494485c1a4de09442864c21e Mon Sep 17 00:00:00 2001 From: Julio-Oliveira-Encora Date: Mon, 3 Jun 2024 12:53:02 -0300 Subject: [PATCH 2/3] Addressed PR comment. --- netbox/extras/forms/filtersets.py | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/netbox/extras/forms/filtersets.py b/netbox/extras/forms/filtersets.py index b80d7b346ea..2ae5662c208 100644 --- a/netbox/extras/forms/filtersets.py +++ b/netbox/extras/forms/filtersets.py @@ -464,13 +464,10 @@ class JournalEntryFilterForm(NetBoxModelFilterSetForm): required=False, label=_('User') ) - assigned_object_type_id = DynamicModelMultipleChoiceField( - queryset=ObjectType.objects.all(), + assigned_object_type_id = ContentTypeMultipleChoiceField( + queryset=ObjectType.objects.with_feature('custom_links'), required=False, label=_('Object Type'), - widget=APISelectMultiple( - api_url='/api/extras/object-types/', - ) ) kind = forms.ChoiceField( label=_('Kind'), @@ -507,11 +504,8 @@ class ObjectChangeFilterForm(SavedFiltersMixin, FilterForm): required=False, label=_('User') ) - changed_object_type_id = DynamicModelMultipleChoiceField( - queryset=ObjectType.objects.all(), + changed_object_type_id = ContentTypeMultipleChoiceField( + queryset=ObjectType.objects.with_feature('custom_links'), required=False, label=_('Object Type'), - widget=APISelectMultiple( - api_url='/api/extras/object-types/', - ) ) From 79fb7506d5c69403e8e00ff8a3a655784f176ea9 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 4 Jun 2024 09:07:29 -0400 Subject: [PATCH 3/3] Correct feature classifications --- netbox/extras/forms/filtersets.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/netbox/extras/forms/filtersets.py b/netbox/extras/forms/filtersets.py index 2ae5662c208..e6b001f2c95 100644 --- a/netbox/extras/forms/filtersets.py +++ b/netbox/extras/forms/filtersets.py @@ -465,7 +465,7 @@ class JournalEntryFilterForm(NetBoxModelFilterSetForm): label=_('User') ) assigned_object_type_id = ContentTypeMultipleChoiceField( - queryset=ObjectType.objects.with_feature('custom_links'), + queryset=ObjectType.objects.with_feature('journaling'), required=False, label=_('Object Type'), ) @@ -505,7 +505,7 @@ class ObjectChangeFilterForm(SavedFiltersMixin, FilterForm): label=_('User') ) changed_object_type_id = ContentTypeMultipleChoiceField( - queryset=ObjectType.objects.with_feature('custom_links'), + queryset=ObjectType.objects.with_feature('change_logging'), required=False, label=_('Object Type'), )