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-2.9' into 554-object-permissions

Browse Source
This commit is contained in:
Jeremy Stretch
2020-05-26 16:42:39 -04:00
parent 635fefcb5c 28a14cf5ae
commit 03da9348e5
52 changed files with 830 additions and 521 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/dcim/views.py
View File

@ -986,7 +986,7 @@ class DeviceListView(ObjectListView):
class DeviceView(ObjectView):
queryset = Device.objects.prefetch_related(
'site__region', 'rack__group', 'tenant__group', 'device_role', 'platform'
'site__region', 'rack__group', 'tenant__group', 'device_role', 'platform', 'primary_ip4', 'primary_ip6'
)
def get(self, request, pk):