NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-12-11 10:59:36 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge pull request #20847 from pheus/20839-fix-objecttype-filterform-for-customlinks-and-savedfilters

Browse Source 
Fixes #20839: Rename `object_type` to `object_type_id` in FilterForm for `CustomLink` and `SavedFilter`
This commit is contained in:
bctiemann 2025-11-25 09:08:16 -05:00 committed by GitHub
commit 4e8edfb3d6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
netbox/extras/forms/filtersets.py
View File

@ -139,12 +139,12 @@ class CustomLinkFilterForm(SavedFiltersMixin, FilterForm):
model = CustomLink model = CustomLink
fieldsets = ( fieldsets = (
FieldSet('q', 'filter_id'), FieldSet('q', 'filter_id'),
FieldSet('object_type', 'enabled', 'new_window', 'weight', name=_('Attributes')), FieldSet('object_type_id', 'enabled', 'new_window', 'weight', name=_('Attributes')),
) )
object_type = ContentTypeMultipleChoiceField( object_type_id = ContentTypeMultipleChoiceField(
label=_('Object types'), label=_('Object types'),
queryset=ObjectType.objects.with_feature('custom_links'), queryset=ObjectType.objects.with_feature('custom_links'),
required=False required=False,
) )
enabled = forms.NullBooleanField( enabled = forms.NullBooleanField(
label=_('Enabled'), label=_('Enabled'),
@ -233,12 +233,12 @@ class SavedFilterFilterForm(SavedFiltersMixin, FilterForm):
model = SavedFilter model = SavedFilter
fieldsets = ( fieldsets = (
FieldSet('q', 'filter_id'), FieldSet('q', 'filter_id'),
FieldSet('object_type', 'enabled', 'shared', 'weight', name=_('Attributes')), FieldSet('object_type_id', 'enabled', 'shared', 'weight', name=_('Attributes')),
) )
object_type = ContentTypeMultipleChoiceField( object_type_id = ContentTypeMultipleChoiceField(
label=_('Object types'), label=_('Object types'),
queryset=ObjectType.objects.public(), queryset=ObjectType.objects.public(),
required=False required=False,
) )
enabled = forms.NullBooleanField( enabled = forms.NullBooleanField(
label=_('Enabled'), label=_('Enabled'),