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 pull request #248 from Zanthras/develop

Browse Source 
possible fix for #243 generic sorting for device bays
This commit is contained in:
Jeremy Stretch
2016-07-12 14:13:25 -04:00
committed by GitHub
parent 18846cf40a 173a4cde8b
commit d80ffd2308
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
netbox/dcim/views.py
View File

@ -1,4 +1,5 @@
import re
from operator import attrgetter
from django.contrib import messages
from django.contrib.auth.decorators import permission_required
@ -12,6 +13,8 @@ from django.shortcuts import get_object_or_404, redirect, render
from django.utils.http import urlencode
from django.views.generic import View
from natsort import natsorted
from ipam.models import Prefix, IPAddress, VLAN
from circuits.models import Circuit
from extras.models import TopologyMap
@ -521,7 +524,10 @@ def device(request, pk):
.select_related('connected_as_a', 'connected_as_b', 'circuit')
mgmt_interfaces = Interface.objects.filter(device=device, mgmt_only=True)\
.select_related('connected_as_a', 'connected_as_b', 'circuit')
device_bays = DeviceBay.objects.filter(device=device).select_related('installed_device__device_type__manufacturer')
device_bays = natsorted(
DeviceBay.objects.filter(device=device).select_related('installed_device__device_type__manufacturer'),
key=attrgetter("name")
)
# Gather any secrets which belong to this device
secrets = device.secrets.all()