Browse Source

Fixes #1603: Hide selection checkboxes for tables with no available actions

Jeremy Stretch 7 years ago
parent
commit
0a04bb110a
2 changed files with 9 additions and 9 deletions
  1. 6 6
      netbox/dcim/views.py
  2. 3 3
      netbox/ipam/views.py

+ 6 - 6
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,

+ 3 - 3
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,