diff --git a/netbox/dcim/tables/devices.py b/netbox/dcim/tables/devices.py index 018e35545..71672dde2 100644 --- a/netbox/dcim/tables/devices.py +++ b/netbox/dcim/tables/devices.py @@ -788,7 +788,6 @@ class DeviceInventoryItemTable(InventoryItemTable): order_by=Accessor('_name'), attrs={'td': {'class': 'text-nowrap'}} ) - actions = columns.ActionsColumn() class Meta(NetBoxTable.Meta): model = InventoryItem diff --git a/netbox/dcim/tables/devicetypes.py b/netbox/dcim/tables/devicetypes.py index 9995ab088..5c38b429f 100644 --- a/netbox/dcim/tables/devicetypes.py +++ b/netbox/dcim/tables/devicetypes.py @@ -110,7 +110,7 @@ class ComponentTemplateTable(NetBoxTable): class ConsolePortTemplateTable(ComponentTemplateTable): actions = columns.ActionsColumn( - sequence=('edit', 'delete'), + actions=('edit', 'delete'), extra_buttons=MODULAR_COMPONENT_TEMPLATE_BUTTONS ) @@ -122,7 +122,7 @@ class ConsolePortTemplateTable(ComponentTemplateTable): class ConsoleServerPortTemplateTable(ComponentTemplateTable): actions = columns.ActionsColumn( - sequence=('edit', 'delete'), + actions=('edit', 'delete'), extra_buttons=MODULAR_COMPONENT_TEMPLATE_BUTTONS ) @@ -134,7 +134,7 @@ class ConsoleServerPortTemplateTable(ComponentTemplateTable): class PowerPortTemplateTable(ComponentTemplateTable): actions = columns.ActionsColumn( - sequence=('edit', 'delete'), + actions=('edit', 'delete'), extra_buttons=MODULAR_COMPONENT_TEMPLATE_BUTTONS ) @@ -146,7 +146,7 @@ class PowerPortTemplateTable(ComponentTemplateTable): class PowerOutletTemplateTable(ComponentTemplateTable): actions = columns.ActionsColumn( - sequence=('edit', 'delete'), + actions=('edit', 'delete'), extra_buttons=MODULAR_COMPONENT_TEMPLATE_BUTTONS ) @@ -161,7 +161,7 @@ class InterfaceTemplateTable(ComponentTemplateTable): verbose_name='Management Only' ) actions = columns.ActionsColumn( - sequence=('edit', 'delete'), + actions=('edit', 'delete'), extra_buttons=MODULAR_COMPONENT_TEMPLATE_BUTTONS ) @@ -177,7 +177,7 @@ class FrontPortTemplateTable(ComponentTemplateTable): ) color = columns.ColorColumn() actions = columns.ActionsColumn( - sequence=('edit', 'delete'), + actions=('edit', 'delete'), extra_buttons=MODULAR_COMPONENT_TEMPLATE_BUTTONS ) @@ -190,7 +190,7 @@ class FrontPortTemplateTable(ComponentTemplateTable): class RearPortTemplateTable(ComponentTemplateTable): color = columns.ColorColumn() actions = columns.ActionsColumn( - sequence=('edit', 'delete'), + actions=('edit', 'delete'), extra_buttons=MODULAR_COMPONENT_TEMPLATE_BUTTONS ) @@ -202,7 +202,7 @@ class RearPortTemplateTable(ComponentTemplateTable): class ModuleBayTemplateTable(ComponentTemplateTable): actions = columns.ActionsColumn( - sequence=('edit', 'delete') + actions=('edit', 'delete') ) class Meta(ComponentTemplateTable.Meta): @@ -213,7 +213,7 @@ class ModuleBayTemplateTable(ComponentTemplateTable): class DeviceBayTemplateTable(ComponentTemplateTable): actions = columns.ActionsColumn( - sequence=('edit', 'delete') + actions=('edit', 'delete') ) class Meta(ComponentTemplateTable.Meta): @@ -224,7 +224,7 @@ class DeviceBayTemplateTable(ComponentTemplateTable): class InventoryItemTemplateTable(ComponentTemplateTable): actions = columns.ActionsColumn( - sequence=('edit', 'delete') + actions=('edit', 'delete') ) role = tables.Column( linkify=True diff --git a/netbox/extras/tables/tables.py b/netbox/extras/tables/tables.py index db05705d2..8880bd45d 100644 --- a/netbox/extras/tables/tables.py +++ b/netbox/extras/tables/tables.py @@ -195,7 +195,9 @@ class ObjectChangeTable(NetBoxTable): template_code=OBJECTCHANGE_REQUEST_ID, verbose_name='Request ID' ) - actions = columns.ActionsColumn(sequence=()) + actions = columns.ActionsColumn( + actions=() + ) class Meta(NetBoxTable.Meta): model = ObjectChange diff --git a/netbox/ipam/tables/fhrp.py b/netbox/ipam/tables/fhrp.py index 55a07b1c7..f5b89f851 100644 --- a/netbox/ipam/tables/fhrp.py +++ b/netbox/ipam/tables/fhrp.py @@ -57,7 +57,7 @@ class FHRPGroupAssignmentTable(NetBoxTable): linkify=True ) actions = columns.ActionsColumn( - sequence=('edit', 'delete') + actions=('edit', 'delete') ) class Meta(NetBoxTable.Meta): diff --git a/netbox/ipam/tables/vlans.py b/netbox/ipam/tables/vlans.py index 192da0813..4551a1c3d 100644 --- a/netbox/ipam/tables/vlans.py +++ b/netbox/ipam/tables/vlans.py @@ -151,7 +151,7 @@ class VLANDevicesTable(VLANMembersTable): linkify=True ) actions = columns.ActionsColumn( - sequence=('edit',) + actions=('edit',) ) class Meta(NetBoxTable.Meta): @@ -165,7 +165,7 @@ class VLANVirtualMachinesTable(VLANMembersTable): linkify=True ) actions = columns.ActionsColumn( - sequence=('edit',) + actions=('edit',) ) class Meta(NetBoxTable.Meta): diff --git a/netbox/netbox/tables/columns.py b/netbox/netbox/tables/columns.py index 6cad42514..465758ac6 100644 --- a/netbox/netbox/tables/columns.py +++ b/netbox/netbox/tables/columns.py @@ -6,7 +6,7 @@ from django.conf import settings from django.contrib.auth.models import AnonymousUser from django.db.models import DateField, DateTimeField from django.template import Context, Template -from django.urls import reverse +from django.urls import NoReverseMatch, reverse from django.utils.formats import date_format from django.utils.safestring import mark_safe from django_tables2.columns import library @@ -144,7 +144,7 @@ class ActionsColumn(tables.Column): A dropdown menu which provides edit, delete, and changelog links for an object. Can optionally include additional buttons rendered from a template string. - :param sequence: The ordered list of dropdown menu items to include + :param actions: The ordered list of dropdown menu items to include :param extra_buttons: A Django template string which renders additional buttons preceding the actions dropdown """ attrs = {'td': {'class': 'text-end text-nowrap noprint'}} @@ -155,14 +155,14 @@ class ActionsColumn(tables.Column): 'changelog': ActionsItem('Changelog', 'history'), } - def __init__(self, *args, sequence=('edit', 'delete', 'changelog'), extra_buttons='', **kwargs): + def __init__(self, *args, actions=('edit', 'delete', 'changelog'), extra_buttons='', **kwargs): super().__init__(*args, **kwargs) self.extra_buttons = extra_buttons # Determine which actions to enable self.actions = { - name: self.actions[name] for name in sequence + name: self.actions[name] for name in actions } def header(self): diff --git a/netbox/tenancy/tables/contacts.py b/netbox/tenancy/tables/contacts.py index 09f418473..cc37efd44 100644 --- a/netbox/tenancy/tables/contacts.py +++ b/netbox/tenancy/tables/contacts.py @@ -86,7 +86,7 @@ class ContactAssignmentTable(NetBoxTable): linkify=True ) actions = columns.ActionsColumn( - sequence=('edit', 'delete') + actions=('edit', 'delete') ) class Meta(NetBoxTable.Meta): diff --git a/netbox/virtualization/tables/virtualmachines.py b/netbox/virtualization/tables/virtualmachines.py index a2c8a4151..b0922ce88 100644 --- a/netbox/virtualization/tables/virtualmachines.py +++ b/netbox/virtualization/tables/virtualmachines.py @@ -99,7 +99,7 @@ class VirtualMachineVMInterfaceTable(VMInterfaceTable): linkify=True ) actions = columns.ActionsColumn( - sequence=('edit', 'delete'), + actions=('edit', 'delete'), extra_buttons=VMINTERFACE_BUTTONS )