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 'develop' into feature

Browse Source
This commit is contained in:
jeremystretch
2021-12-13 11:29:54 -05:00
parent 7d99e15dc3 e9549ab0bd
commit f2f6edabf9
23 changed files with 286 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/tenancy/api/serializers.py
View File

@@ -56,7 +56,7 @@ class TenantSerializer(PrimaryModelSerializer):
class ContactGroupSerializer(NestedGroupModelSerializer):
url = serializers.HyperlinkedIdentityField(view_name='tenancy-api:contactgroup-detail')
parent = NestedContactGroupSerializer(required=False, allow_null=True)
parent = NestedContactGroupSerializer(required=False, allow_null=True, default=None)
contact_count = serializers.IntegerField(read_only=True)
class Meta:

1
netbox/tenancy/forms/filtersets.py
View File

@@ -1,4 +1,3 @@
from django import forms
from django.utils.translation import gettext as _
from extras.forms import CustomFieldModelFilterForm