From 0a04bb110a2df199bc8c006c4622e84cfaecb0c4 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 27 Oct 2017 10:33:58 -0400 Subject: [PATCH] Fixes #1603: Hide selection checkboxes for tables with no available actions --- netbox/dcim/views.py | 12 ++++++------ netbox/ipam/views.py | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 268682f67..e0ab7f1f2 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -517,12 +517,12 @@ class DeviceTypeView(View): show_header=False ) if request.user.has_perm('dcim.change_devicetype'): - consoleport_table.base_columns['pk'].visible = True - consoleserverport_table.base_columns['pk'].visible = True - powerport_table.base_columns['pk'].visible = True - poweroutlet_table.base_columns['pk'].visible = True - interface_table.base_columns['pk'].visible = True - devicebay_table.base_columns['pk'].visible = True + consoleport_table.columns.show('pk') + consoleserverport_table.columns.show('pk') + powerport_table.columns.show('pk') + poweroutlet_table.columns.show('pk') + interface_table.columns.show('pk') + devicebay_table.columns.show('pk') return render(request, 'dcim/devicetype.html', { 'devicetype': devicetype, diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index 7cf24614f..48e7e8478 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -325,7 +325,7 @@ class AggregateView(View): prefix_table = tables.PrefixDetailTable(child_prefixes) if request.user.has_perm('ipam.change_prefix') or request.user.has_perm('ipam.delete_prefix'): - prefix_table.base_columns['pk'].visible = True + prefix_table.columns.show('pk') paginate = { 'klass': EnhancedPaginator, @@ -495,7 +495,7 @@ class PrefixView(View): child_prefixes = add_available_prefixes(prefix.prefix, child_prefixes) child_prefix_table = tables.PrefixDetailTable(child_prefixes) if request.user.has_perm('ipam.change_prefix') or request.user.has_perm('ipam.delete_prefix'): - child_prefix_table.base_columns['pk'].visible = True + child_prefix_table.columns.show('pk') paginate = { 'klass': EnhancedPaginator, @@ -538,7 +538,7 @@ class PrefixIPAddressesView(View): ip_table = tables.IPAddressTable(ipaddresses) if request.user.has_perm('ipam.change_ipaddress') or request.user.has_perm('ipam.delete_ipaddress'): - ip_table.base_columns['pk'].visible = True + ip_table.columns.show('pk') paginate = { 'klass': EnhancedPaginator,