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

Add 'display' field to all REST API serializers

Browse Source
This commit is contained in:
Jeremy Stretch
2021-03-16 10:06:25 -04:00
parent ee7f7c877a
commit fb48c1f6dd
26 changed files with 287 additions and 256 deletions
Download Patch File Download Diff File Expand all files Collapse all files
netbox/users/api/nested_serializers.py
+3 -3
View File
@@ -17,7 +17,7 @@ class NestedGroupSerializer(WritableNestedSerializer):
class Meta:
model = Group
fields = ['id', 'url', 'name']
fields = ['id', 'url', 'display', 'name']
class NestedUserSerializer(WritableNestedSerializer):
@@ -25,7 +25,7 @@ class NestedUserSerializer(WritableNestedSerializer):
class Meta:
model = User
fields = ['id', 'url', 'username']
fields = ['id', 'url', 'display', 'username']
class NestedObjectPermissionSerializer(WritableNestedSerializer):
@@ -39,7 +39,7 @@ class NestedObjectPermissionSerializer(WritableNestedSerializer):
class Meta:
model = ObjectPermission
fields = ['id', 'url', 'name', 'enabled', 'object_types', 'groups', 'users', 'actions']
fields = ['id', 'url', 'display', 'name', 'enabled', 'object_types', 'groups', 'users', 'actions']
def get_groups(self, obj):
return [g.name for g in obj.groups.all()]
netbox/users/api/serializers.py
+4 -3
View File
@@ -19,7 +19,7 @@ class UserSerializer(ValidatedModelSerializer):
class Meta:
model = User
fields = (
'id', 'url', 'username', 'password', 'first_name', 'last_name', 'email', 'is_staff', 'is_active',
'id', 'url', 'display', 'username', 'password', 'first_name', 'last_name', 'email', 'is_staff', 'is_active',
'date_joined', 'groups',
)
extra_kwargs = {
@@ -44,7 +44,7 @@ class GroupSerializer(ValidatedModelSerializer):
class Meta:
model = Group
fields = ('id', 'url', 'name', 'user_count')
fields = ('id', 'url', 'display', 'name', 'user_count')
class ObjectPermissionSerializer(ValidatedModelSerializer):
@@ -69,5 +69,6 @@ class ObjectPermissionSerializer(ValidatedModelSerializer):
class Meta:
model = ObjectPermission
fields = (
'id', 'url', 'name', 'description', 'enabled', 'object_types', 'groups', 'users', 'actions', 'constraints',
'id', 'url', 'display', 'name', 'description', 'enabled', 'object_types', 'groups', 'users', 'actions',
'constraints',
)
netbox/users/tests/test_api.py
+3 -3
View File
@@ -20,7 +20,7 @@ class AppTest(APITestCase):
class UserTest(APIViewTestCases.APIViewTestCase):
model = User
view_namespace = 'users'
brief_fields = ['id', 'url', 'username']
brief_fields = ['display', 'id', 'url', 'username']
validation_excluded_fields = ['password']
create_data = [
{
@@ -51,7 +51,7 @@ class UserTest(APIViewTestCases.APIViewTestCase):
class GroupTest(APIViewTestCases.APIViewTestCase):
model = Group
view_namespace = 'users'
brief_fields = ['id', 'name', 'url']
brief_fields = ['display', 'id', 'name', 'url']
create_data = [
{
'name': 'Group 4',
@@ -77,7 +77,7 @@ class GroupTest(APIViewTestCases.APIViewTestCase):
class ObjectPermissionTest(APIViewTestCases.APIViewTestCase):
model = ObjectPermission
brief_fields = ['actions', 'enabled', 'groups', 'id', 'name', 'object_types', 'url', 'users']
brief_fields = ['actions', 'display', 'enabled', 'groups', 'id', 'name', 'object_types', 'url', 'users']
@classmethod
def setUpTestData(cls):