Closes #6161: Enable ordering of device component tables

This commit is contained in:
jeremystretch
2021-04-20 20:21:52 -04:00
parent 4e405ce530
commit e6930d9601
3 changed files with 19 additions and 18 deletions

View File

@@ -1319,8 +1319,7 @@ class DeviceConsolePortsView(generic.ObjectView):
)
consoleport_table = tables.DeviceConsolePortTable(
data=consoleports,
user=request.user,
orderable=False
user=request.user
)
if request.user.has_perm('dcim.change_consoleport') or request.user.has_perm('dcim.delete_consoleport'):
consoleport_table.columns.show('pk')
@@ -1344,8 +1343,7 @@ class DeviceConsoleServerPortsView(generic.ObjectView):
)
consoleserverport_table = tables.DeviceConsoleServerPortTable(
data=consoleserverports,
user=request.user,
orderable=False
user=request.user
)
if request.user.has_perm('dcim.change_consoleserverport') or \
request.user.has_perm('dcim.delete_consoleserverport'):
@@ -1368,8 +1366,7 @@ class DevicePowerPortsView(generic.ObjectView):
)
powerport_table = tables.DevicePowerPortTable(
data=powerports,
user=request.user,
orderable=False
user=request.user
)
if request.user.has_perm('dcim.change_powerport') or request.user.has_perm('dcim.delete_powerport'):
powerport_table.columns.show('pk')
@@ -1391,8 +1388,7 @@ class DevicePowerOutletsView(generic.ObjectView):
)
poweroutlet_table = tables.DevicePowerOutletTable(
data=poweroutlets,
user=request.user,
orderable=False
user=request.user
)
if request.user.has_perm('dcim.change_poweroutlet') or request.user.has_perm('dcim.delete_poweroutlet'):
poweroutlet_table.columns.show('pk')
@@ -1416,8 +1412,7 @@ class DeviceInterfacesView(generic.ObjectView):
)
interface_table = tables.DeviceInterfaceTable(
data=interfaces,
user=request.user,
orderable=False
user=request.user
)
if request.user.has_perm('dcim.change_interface') or request.user.has_perm('dcim.delete_interface'):
interface_table.columns.show('pk')
@@ -1439,8 +1434,7 @@ class DeviceFrontPortsView(generic.ObjectView):
)
frontport_table = tables.DeviceFrontPortTable(
data=frontports,
user=request.user,
orderable=False
user=request.user
)
if request.user.has_perm('dcim.change_frontport') or request.user.has_perm('dcim.delete_frontport'):
frontport_table.columns.show('pk')
@@ -1460,8 +1454,7 @@ class DeviceRearPortsView(generic.ObjectView):
rearports = RearPort.objects.restrict(request.user, 'view').filter(device=instance).prefetch_related('cable')
rearport_table = tables.DeviceRearPortTable(
data=rearports,
user=request.user,
orderable=False
user=request.user
)
if request.user.has_perm('dcim.change_rearport') or request.user.has_perm('dcim.delete_rearport'):
rearport_table.columns.show('pk')
@@ -1483,8 +1476,7 @@ class DeviceDeviceBaysView(generic.ObjectView):
)
devicebay_table = tables.DeviceDeviceBayTable(
data=devicebays,
user=request.user,
orderable=False
user=request.user
)
if request.user.has_perm('dcim.change_devicebay') or request.user.has_perm('dcim.delete_devicebay'):
devicebay_table.columns.show('pk')
@@ -1506,8 +1498,7 @@ class DeviceInventoryView(generic.ObjectView):
).prefetch_related('manufacturer')
inventoryitem_table = tables.DeviceInventoryItemTable(
data=inventoryitems,
user=request.user,
orderable=False
user=request.user
)
if request.user.has_perm('dcim.change_inventoryitem') or request.user.has_perm('dcim.delete_inventoryitem'):
inventoryitem_table.columns.show('pk')