mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

9856 compatability fixes

Browse Source
This commit is contained in:
Arthur
2024-01-09 14:23:10 -08:00
parent 7a222a6501
commit 28c48b3d6c
4 changed files with 49 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
netbox/circuits/graphql/filters.py
View File

@ -1,4 +1,5 @@
import strawberry import strawberry
import strawberry_django
from strawberry import auto from strawberry import auto
from circuits import models, filtersets from circuits import models, filtersets
@ -12,7 +13,7 @@ __all__ = (
) )
@strawberry.django.filter(models.CircuitTermination, lookups=True) @strawberry_django.filter(models.CircuitTermination, lookups=True)
class CircuitTerminationFilter(filtersets.CircuitTerminationFilterSet): class CircuitTerminationFilter(filtersets.CircuitTerminationFilterSet):
id: auto id: auto
term_side: auto term_side: auto
@ -28,7 +29,7 @@ class CircuitTerminationFilter(filtersets.CircuitTerminationFilterSet):
# provider_network_id: auto # provider_network_id: auto
@strawberry.django.filter(models.Circuit, lookups=True) @strawberry_django.filter(models.Circuit, lookups=True)
class CircuitFilter(filtersets.CircuitFilterSet): class CircuitFilter(filtersets.CircuitFilterSet):
id: auto id: auto
cid: auto cid: auto
@ -39,19 +40,34 @@ class CircuitFilter(filtersets.CircuitFilterSet):
provider_id: auto provider_id: auto
provider: auto provider: auto
provider_account_id: auto provider_account_id: auto
# provider_network_id: auto
type_id: auto type_id: auto
type: auto
status: auto status: auto
# region_id: auto
# region: auto
# site_group_id: auto
# site_group: auto
# site_id: auto
# site: auto
@strawberry.django.filter(models.CircuitType, lookups=True) # @strawberry_django.filter(models.Circuit, lookups=True)
# class CircuitFilter(filtersets.CircuitFilterSet):
# id: auto
# cid: auto
# description: auto
# install_date: auto
# termination_date: auto
# commit_rate: auto
# provider_id: auto
# provider: auto
# provider_account_id: auto
# # provider_network_id: auto
# type_id: auto
# type: auto
# status: auto
# # region_id: auto
# # region: auto
# # site_group_id: auto
# # site_group: auto
# # site_id: auto
# # site: auto
@strawberry_django.filter(models.CircuitType, lookups=True)
class CircuitTypeFilter(filtersets.CircuitTypeFilterSet): class CircuitTypeFilter(filtersets.CircuitTypeFilterSet):
id: auto id: auto
name: auto name: auto
@ -59,7 +75,7 @@ class CircuitTypeFilter(filtersets.CircuitTypeFilterSet):
description: auto description: auto
@strawberry.django.filter(models.Provider, lookups=True) @strawberry_django.filter(models.Provider, lookups=True)
class ProviderFilter(filtersets.ProviderFilterSet): class ProviderFilter(filtersets.ProviderFilterSet):
id: auto id: auto
name: auto name: auto
@ -73,7 +89,7 @@ class ProviderFilter(filtersets.ProviderFilterSet):
# asn_id: auto # asn_id: auto
@strawberry.django.filter(models.ProviderAccount, lookups=True) @strawberry_django.filter(models.ProviderAccount, lookups=True)
class ProviderAccountFilter(filtersets.ProviderAccountFilterSet): class ProviderAccountFilter(filtersets.ProviderAccountFilterSet):
id: auto id: auto
name: auto name: auto
@ -83,7 +99,7 @@ class ProviderAccountFilter(filtersets.ProviderAccountFilterSet):
# provider: auto # provider: auto
@strawberry.django.filter(models.ProviderNetwork, lookups=True) @strawberry_django.filter(models.ProviderNetwork, lookups=True)
class ProviderNetworkFilter(filtersets.ProviderNetworkFilterSet): class ProviderNetworkFilter(filtersets.ProviderNetworkFilterSet):
id: auto id: auto
name: auto name: auto

25
netbox/circuits/graphql/schema.py
View File

@ -1,5 +1,6 @@
from typing import List from typing import List
import strawberry import strawberry
import strawberry_django
from circuits import models from circuits import models
from .types import * from .types import *
@ -7,20 +8,20 @@ from .types import *
@strawberry.type @strawberry.type
class CircuitsQuery: class CircuitsQuery:
circuit: CircuitType = strawberry.django.field() circuit: CircuitType = strawberry_django.field()
circuit_list: List[CircuitType] = strawberry.django.field() circuit_list: List[CircuitType] = strawberry_django.field()
circuit_termination: CircuitTerminationType = strawberry.django.field() circuit_termination: CircuitTerminationType = strawberry_django.field()
circuit_termination_list: List[CircuitTerminationType] = strawberry.django.field() circuit_termination_list: List[CircuitTerminationType] = strawberry_django.field()
circuit_type: CircuitTypeType = strawberry.django.field() circuit_type: CircuitTypeType = strawberry_django.field()
circuit_type_list: List[CircuitTypeType] = strawberry.django.field() circuit_type_list: List[CircuitTypeType] = strawberry_django.field()
provider: ProviderType = strawberry.django.field() provider: ProviderType = strawberry_django.field()
provider_list: List[ProviderType] = strawberry.django.field() provider_list: List[ProviderType] = strawberry_django.field()
provider_account: ProviderAccountType = strawberry.django.field() provider_account: ProviderAccountType = strawberry_django.field()
provider_account_list: List[ProviderAccountType] = strawberry.django.field() provider_account_list: List[ProviderAccountType] = strawberry_django.field()
provider_network: ProviderNetworkType = strawberry.django.field() provider_network: ProviderNetworkType = strawberry_django.field()
provider_network_list: List[ProviderNetworkType] = strawberry.django.field() provider_network_list: List[ProviderNetworkType] = strawberry_django.field()

2
netbox/netbox/graphql/types.py
View File

@ -29,7 +29,7 @@ class BaseObjectType:
""" """
@classmethod @classmethod
def get_queryset(cls, queryset, info): def get_queryset(cls, queryset, info, **kwargs):
# Enforce object permissions on the queryset # Enforce object permissions on the queryset
return queryset.restrict(info.context.request.user, 'view') return queryset.restrict(info.context.request.user, 'view')

9
netbox/users/graphql/schema.py
View File

@ -1,5 +1,6 @@
from typing import List from typing import List
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
@ -8,8 +9,8 @@ from .types import *
@strawberry.type @strawberry.type
class UsersQuery: class UsersQuery:
group: GroupType = strawberry.django.field() group: GroupType = strawberry_django.field()
group_list: List[GroupType] = strawberry.django.field() group_list: List[GroupType] = strawberry_django.field()
user: UserType = strawberry.django.field() user: UserType = strawberry_django.field()
user_list: List[UserType] = strawberry.django.field() user_list: List[UserType] = strawberry_django.field()