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

Merge pull request #9150 from minitriga/issue_8894

Closes #8894: Add first and last name username user api select
Jeremy Stretch 3 лет назад
Родитель
Сommit
52b18393eb
2 измененных файлов с 10 добавлено и 0 удалено
  1. 5 0
      netbox/users/api/nested_serializers.py
  2. 5 0
      netbox/users/api/serializers.py

+ 5 - 0
netbox/users/api/nested_serializers.py

@@ -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 - 0
netbox/users/api/serializers.py

@@ -44,6 +44,11 @@ class UserSerializer(ValidatedModelSerializer):
         user.save()
 
         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):