Arthur 2 лет назад
Родитель
Сommit
6d7678f017
2 измененных файлов с 17 добавлено и 15 удалено
  1. 14 13
      netbox/extras/graphql/filters.py
  2. 3 2
      netbox/users/graphql/filters.py

+ 14 - 13
netbox/extras/graphql/filters.py

@@ -1,4 +1,5 @@
 import strawberry
 import strawberry
+import strawberry_django
 from strawberry import auto
 from strawberry import auto
 from extras import models, filtersets
 from extras import models, filtersets
 
 
@@ -19,7 +20,7 @@ __all__ = (
 )
 )
 
 
 
 
-@strawberry.django.filter(models.ConfigContext, lookups=True)
+@strawberry_django.filter(models.ConfigContext, lookups=True)
 class ConfigContextFilter(filtersets.ConfigContextFilterSet):
 class ConfigContextFilter(filtersets.ConfigContextFilterSet):
     id: auto
     id: auto
     name: auto
     name: auto
@@ -27,7 +28,7 @@ class ConfigContextFilter(filtersets.ConfigContextFilterSet):
     data_synced: auto
     data_synced: auto
 
 
 
 
-@strawberry.django.filter(models.ConfigTemplate, lookups=True)
+@strawberry_django.filter(models.ConfigTemplate, lookups=True)
 class ConfigTemplateFilter(filtersets.ConfigTemplateFilterSet):
 class ConfigTemplateFilter(filtersets.ConfigTemplateFilterSet):
     id: auto
     id: auto
     name: auto
     name: auto
@@ -35,7 +36,7 @@ class ConfigTemplateFilter(filtersets.ConfigTemplateFilterSet):
     data_synced: auto
     data_synced: auto
 
 
 
 
-@strawberry.django.filter(models.CustomField, lookups=True)
+@strawberry_django.filter(models.CustomField, lookups=True)
 class CustomFieldFilter(filtersets.CustomFieldFilterSet):
 class CustomFieldFilter(filtersets.CustomFieldFilterSet):
     id: auto
     id: auto
     content_types: auto
     content_types: auto
@@ -49,7 +50,7 @@ class CustomFieldFilter(filtersets.CustomFieldFilterSet):
     description: auto
     description: auto
 
 
 
 
-@strawberry.django.filter(models.CustomFieldChoiceSet, lookups=True)
+@strawberry_django.filter(models.CustomFieldChoiceSet, lookups=True)
 class CustomFieldChoiceSetFilter(filtersets.CustomFieldChoiceSetFilterSet):
 class CustomFieldChoiceSetFilter(filtersets.CustomFieldChoiceSetFilterSet):
     id: auto
     id: auto
     name: auto
     name: auto
@@ -58,7 +59,7 @@ class CustomFieldChoiceSetFilter(filtersets.CustomFieldChoiceSetFilterSet):
     order_alphabetically: auto
     order_alphabetically: auto
 
 
 
 
-@strawberry.django.filter(models.CustomLink, lookups=True)
+@strawberry_django.filter(models.CustomLink, lookups=True)
 class CustomLinkFilter(filtersets.CustomLinkFilterSet):
 class CustomLinkFilter(filtersets.CustomLinkFilterSet):
     id: auto
     id: auto
     content_types: auto
     content_types: auto
@@ -71,7 +72,7 @@ class CustomLinkFilter(filtersets.CustomLinkFilterSet):
     new_window: auto
     new_window: auto
 
 
 
 
-@strawberry.django.filter(models.ExportTemplate, lookups=True)
+@strawberry_django.filter(models.ExportTemplate, lookups=True)
 class ExportTemplateFilter(filtersets.ExportTemplateFilterSet):
 class ExportTemplateFilter(filtersets.ExportTemplateFilterSet):
     id: auto
     id: auto
     content_types: auto
     content_types: auto
@@ -80,7 +81,7 @@ class ExportTemplateFilter(filtersets.ExportTemplateFilterSet):
     data_synced: auto
     data_synced: auto
 
 
 
 
-@strawberry.django.filter(models.ImageAttachment, lookups=True)
+@strawberry_django.filter(models.ImageAttachment, lookups=True)
 class ImageAttachmentFilter(filtersets.ImageAttachmentFilterSet):
 class ImageAttachmentFilter(filtersets.ImageAttachmentFilterSet):
     id: auto
     id: auto
     content_type_id: auto
     content_type_id: auto
@@ -88,7 +89,7 @@ class ImageAttachmentFilter(filtersets.ImageAttachmentFilterSet):
     name: auto
     name: auto
 
 
 
 
-@strawberry.django.filter(models.JournalEntry, lookups=True)
+@strawberry_django.filter(models.JournalEntry, lookups=True)
 class JournalEntryFilter(filtersets.JournalEntryFilterSet):
 class JournalEntryFilter(filtersets.JournalEntryFilterSet):
     id: auto
     id: auto
     assigned_object_type_id: auto
     assigned_object_type_id: auto
@@ -97,7 +98,7 @@ class JournalEntryFilter(filtersets.JournalEntryFilterSet):
     kind: auto
     kind: auto
 
 
 
 
-@strawberry.django.filter(models.ObjectChange, lookups=True)
+@strawberry_django.filter(models.ObjectChange, lookups=True)
 class ObjectChangeFilter(filtersets.ObjectChangeFilterSet):
 class ObjectChangeFilter(filtersets.ObjectChangeFilterSet):
     id: auto
     id: auto
     user: auto
     user: auto
@@ -109,7 +110,7 @@ class ObjectChangeFilter(filtersets.ObjectChangeFilterSet):
     object_repr: auto
     object_repr: auto
 
 
 
 
-@strawberry.django.filter(models.SavedFilter, lookups=True)
+@strawberry_django.filter(models.SavedFilter, lookups=True)
 class SavedFilterFilter(filtersets.SavedFilterFilterSet):
 class SavedFilterFilter(filtersets.SavedFilterFilterSet):
     id: auto
     id: auto
     content_types: auto
     content_types: auto
@@ -121,7 +122,7 @@ class SavedFilterFilter(filtersets.SavedFilterFilterSet):
     weight: auto
     weight: auto
 
 
 
 
-@strawberry.django.filter(models.Tag, lookups=True)
+@strawberry_django.filter(models.Tag, lookups=True)
 class TagFilter(filtersets.TagFilterSet):
 class TagFilter(filtersets.TagFilterSet):
     id: auto
     id: auto
     name: auto
     name: auto
@@ -131,7 +132,7 @@ class TagFilter(filtersets.TagFilterSet):
     object_types: auto
     object_types: auto
 
 
 
 
-@strawberry.django.filter(models.Webhook, lookups=True)
+@strawberry_django.filter(models.Webhook, lookups=True)
 class WebhookFilter(filtersets.WebhookFilterSet):
 class WebhookFilter(filtersets.WebhookFilterSet):
     id: auto
     id: auto
     name: auto
     name: auto
@@ -143,7 +144,7 @@ class WebhookFilter(filtersets.WebhookFilterSet):
     ca_file_path: auto
     ca_file_path: auto
 
 
 
 
-@strawberry.django.filter(models.EventRule, lookups=True)
+@strawberry_django.filter(models.EventRule, lookups=True)
 class EventRuleFilter(filtersets.EventRuleFilterSet):
 class EventRuleFilter(filtersets.EventRuleFilterSet):
     id: auto
     id: auto
     name: auto
     name: auto

+ 3 - 2
netbox/users/graphql/filters.py

@@ -1,4 +1,5 @@
 import strawberry
 import strawberry
+import strawberry_django
 from django.contrib.auth import get_user_model
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import Group
 from django.contrib.auth.models import Group
 from strawberry import auto
 from strawberry import auto
@@ -10,13 +11,13 @@ __all__ = (
 )
 )
 
 
 
 
-@strawberry.django.filter(Group, lookups=True)
+@strawberry_django.filter(Group, lookups=True)
 class GroupFilter(filtersets.GroupFilterSet):
 class GroupFilter(filtersets.GroupFilterSet):
     id: auto
     id: auto
     name: auto
     name: auto
 
 
 
 
-@strawberry.django.filter(get_user_model(), lookups=True)
+@strawberry_django.filter(get_user_model(), lookups=True)
 class UserFilter(filtersets.UserFilterSet):
 class UserFilter(filtersets.UserFilterSet):
     id: auto
     id: auto
     username: auto
     username: auto