NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-12-23 13:52:17 -06:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature

Browse Source
This commit is contained in:
Jeremy Stretch
2024-08-29 10:51:38 -04:00
parent 8cf771a82b b4c0fdc8e6
commit fbdc68851b
90 changed files with 6941 additions and 7075 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/users/api/serializers_/tokens.py
View File

@@ -39,7 +39,7 @@ class TokenSerializer(ValidatedModelSerializer):
brief_fields = ('id', 'url', 'display', 'key', 'write_enabled', 'description')
def to_internal_value(self, data):
if 'key' not in data:
if not getattr(self.instance, 'key', None) and 'key' not in data:
data['key'] = Token.generate_key()
return super().to_internal_value(data)

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

@@ -3,18 +3,13 @@ from typing import List
import strawberry
import strawberry_django
from users import models
from .types import *
@strawberry.type
@strawberry.type(name="Query")
class UsersQuery:
@strawberry.field
def group(self, id: int) -> GroupType:
return models.Group.objects.get(pk=id)
group: GroupType = strawberry_django.field()
group_list: List[GroupType] = strawberry_django.field()
@strawberry.field
def user(self, id: int) -> UserType:
return models.User.objects.get(pk=id)
user: UserType = strawberry_django.field()
user_list: List[UserType] = strawberry_django.field()