NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-08 00:28:16 -06:00
Code Issues Actions 15 Packages Projects Releases Wiki Activity

Merge 36c4f4598b into 2fc1519bc6

Browse Source
This commit is contained in:
John Anderson 2017-12-07 20:34:08 +00:00 committed by GitHub
commit caec83156e
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -216,7 +216,7 @@ class RackUnitSerializer(serializers.Serializer):
class RackReservationSerializer(serializers.ModelSerializer): class RackReservationSerializer(serializers.ModelSerializer):
rack = NestedRackSerializer() rack = NestedRackSerializer()
user= NestedUserSerializer() user = NestedUserSerializer()
tenant = NestedTenantSerializer() tenant = NestedTenantSerializer()
class Meta: class Meta:

1
netbox/utilities/views.py
View File

@ -25,6 +25,7 @@ from utilities.forms import BootstrapMixin, CSVDataField
from .error_handlers import handle_protectederror from .error_handlers import handle_protectederror
from .forms import ConfirmationForm from .forms import ConfirmationForm
from .paginator import EnhancedPaginator from .paginator import EnhancedPaginator
from .constants import *
class CustomFieldQueryset: class CustomFieldQueryset: