Просмотр исходного кода

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

Fixes #20839: Rename `object_type` to `object_type_id` in FilterForm for `CustomLink` and `SavedFilter`
bctiemann 2 месяцев назад
Родитель
Сommit
4e8edfb3d6
1 измененных файлов с 6 добавлено и 6 удалено
  1. 6 6
      netbox/extras/forms/filtersets.py

+ 6 - 6
netbox/extras/forms/filtersets.py

@@ -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'),