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 develop-2.5

Browse Source
This commit is contained in:
Jeremy Stretch
2018-11-12 16:03:52 -05:00
parent 59589fdd29 0c33af2140
commit bc8dbfde7c
18 changed files with 195 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/dcim/tables.py
View File

@ -7,7 +7,7 @@ from .models import (
Cable, ConsoleConnection, ConsolePort, ConsolePortTemplate, ConsoleServerPort, ConsoleServerPortTemplate, Device,
DeviceBay, DeviceBayTemplate, DeviceRole, DeviceType, FrontPort, FrontPortTemplate, Interface, InterfaceConnection,
InterfaceTemplate, InventoryItem, Manufacturer, Platform, PowerConnection, PowerOutlet, PowerOutletTemplate,
PowerPort, PowerPortTemplate, Rack, RackGroup, RackReservation, RearPort, RearPortTemplate, Region, Site,
PowerPort, PowerPortTemplate, Rack, RackGroup, RackReservation, RackRole, RearPort, RearPortTemplate, Region, Site,
VirtualChassis,
)
@ -261,7 +261,7 @@ class RackRoleTable(BaseTable):
verbose_name='')
class Meta(BaseTable.Meta):
model = RackGroup
model = RackRole
fields = ('pk', 'name', 'rack_count', 'color', 'slug', 'actions')