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

Merge branch 'feature' into issue_8233

Browse Source
This commit is contained in:
PieterL75
2022-06-17 16:31:13 +02:00
committed by GitHub
parent fa4807be8c 9b51c2a0b2
commit 536239d272
162 changed files with 2098 additions and 598 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
netbox/users/api/nested_serializers.py
View File

@@ -28,6 +28,11 @@ class NestedUserSerializer(WritableNestedSerializer):
model = User
fields = ['id', 'url', 'display', 'username']
def get_display(self, obj):
if full_name := obj.get_full_name():
return f"{obj.username} ({full_name})"
return obj.username
class NestedTokenSerializer(WritableNestedSerializer):
url = serializers.HyperlinkedIdentityField(view_name='users-api:token-detail')

5
netbox/users/api/serializers.py
View File

@@ -45,6 +45,11 @@ class UserSerializer(ValidatedModelSerializer):
return user
def get_display(self, obj):
if full_name := obj.get_full_name():
return f"{obj.username} ({full_name})"
return obj.username
class GroupSerializer(ValidatedModelSerializer):
url = serializers.HyperlinkedIdentityField(view_name='users-api:group-detail')