From 1bd927250c752920566f9056410cf0ecd7ca8251 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 17 Oct 2023 15:27:17 -0400 Subject: [PATCH] Update obsolete permission maps --- netbox/dcim/views.py | 66 +++++++++++++++++----------------- netbox/virtualization/views.py | 22 ++++++------ 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index 7c75dd26e..240cd1a2d 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -46,15 +46,15 @@ CABLE_TERMINATION_TYPES = { class DeviceComponentsView(generic.ObjectChildrenView): - actions = ('add', 'import', 'export', 'bulk_edit', 'bulk_delete', 'bulk_rename', 'bulk_disconnect') - action_perms = defaultdict(set, **{ + actions = { 'add': {'add'}, 'import': {'add'}, + 'export': set(), 'bulk_edit': {'change'}, 'bulk_delete': {'delete'}, 'bulk_rename': {'change'}, 'bulk_disconnect': {'change'}, - }) + } queryset = Device.objects.all() def get_children(self, request, parent): @@ -2187,14 +2187,14 @@ class ConsolePortListView(generic.ObjectListView): filterset_form = forms.ConsolePortFilterForm table = tables.ConsolePortTable template_name = 'dcim/component_list.html' - actions = ('add', 'import', 'export', 'bulk_edit', 'bulk_delete', 'bulk_rename') - action_perms = defaultdict(set, **{ + actions = { 'add': {'add'}, 'import': {'add'}, + 'export': set(), 'bulk_edit': {'change'}, 'bulk_delete': {'delete'}, 'bulk_rename': {'change'}, - }) + } @register_model_view(ConsolePort) @@ -2259,14 +2259,14 @@ class ConsoleServerPortListView(generic.ObjectListView): filterset_form = forms.ConsoleServerPortFilterForm table = tables.ConsoleServerPortTable template_name = 'dcim/component_list.html' - actions = ('add', 'import', 'export', 'bulk_edit', 'bulk_delete', 'bulk_rename') - action_perms = defaultdict(set, **{ + actions = { 'add': {'add'}, 'import': {'add'}, + 'export': set(), 'bulk_edit': {'change'}, 'bulk_delete': {'delete'}, 'bulk_rename': {'change'}, - }) + } @register_model_view(ConsoleServerPort) @@ -2331,14 +2331,14 @@ class PowerPortListView(generic.ObjectListView): filterset_form = forms.PowerPortFilterForm table = tables.PowerPortTable template_name = 'dcim/component_list.html' - actions = ('add', 'import', 'export', 'bulk_edit', 'bulk_delete', 'bulk_rename') - action_perms = defaultdict(set, **{ + actions = { 'add': {'add'}, 'import': {'add'}, + 'export': set(), 'bulk_edit': {'change'}, 'bulk_delete': {'delete'}, 'bulk_rename': {'change'}, - }) + } @register_model_view(PowerPort) @@ -2403,14 +2403,14 @@ class PowerOutletListView(generic.ObjectListView): filterset_form = forms.PowerOutletFilterForm table = tables.PowerOutletTable template_name = 'dcim/component_list.html' - actions = ('add', 'import', 'export', 'bulk_edit', 'bulk_delete', 'bulk_rename') - action_perms = defaultdict(set, **{ + actions = { 'add': {'add'}, 'import': {'add'}, + 'export': set(), 'bulk_edit': {'change'}, 'bulk_delete': {'delete'}, 'bulk_rename': {'change'}, - }) + } @register_model_view(PowerOutlet) @@ -2475,14 +2475,14 @@ class InterfaceListView(generic.ObjectListView): filterset_form = forms.InterfaceFilterForm table = tables.InterfaceTable template_name = 'dcim/component_list.html' - actions = ('add', 'import', 'export', 'bulk_edit', 'bulk_delete', 'bulk_rename') - action_perms = defaultdict(set, **{ + actions = { 'add': {'add'}, 'import': {'add'}, + 'export': set(), 'bulk_edit': {'change'}, 'bulk_delete': {'delete'}, 'bulk_rename': {'change'}, - }) + } @register_model_view(Interface) @@ -2595,14 +2595,14 @@ class FrontPortListView(generic.ObjectListView): filterset_form = forms.FrontPortFilterForm table = tables.FrontPortTable template_name = 'dcim/component_list.html' - actions = ('add', 'import', 'export', 'bulk_edit', 'bulk_delete', 'bulk_rename') - action_perms = defaultdict(set, **{ + actions = { 'add': {'add'}, 'import': {'add'}, + 'export': set(), 'bulk_edit': {'change'}, 'bulk_delete': {'delete'}, 'bulk_rename': {'change'}, - }) + } @register_model_view(FrontPort) @@ -2667,14 +2667,14 @@ class RearPortListView(generic.ObjectListView): filterset_form = forms.RearPortFilterForm table = tables.RearPortTable template_name = 'dcim/component_list.html' - actions = ('add', 'import', 'export', 'bulk_edit', 'bulk_delete', 'bulk_rename') - action_perms = defaultdict(set, **{ + actions = { 'add': {'add'}, 'import': {'add'}, + 'export': set(), 'bulk_edit': {'change'}, 'bulk_delete': {'delete'}, 'bulk_rename': {'change'}, - }) + } @register_model_view(RearPort) @@ -2739,14 +2739,14 @@ class ModuleBayListView(generic.ObjectListView): filterset_form = forms.ModuleBayFilterForm table = tables.ModuleBayTable template_name = 'dcim/component_list.html' - actions = ('add', 'import', 'export', 'bulk_edit', 'bulk_delete', 'bulk_rename') - action_perms = defaultdict(set, **{ + actions = { 'add': {'add'}, 'import': {'add'}, + 'export': set(), 'bulk_edit': {'change'}, 'bulk_delete': {'delete'}, 'bulk_rename': {'change'}, - }) + } @register_model_view(ModuleBay) @@ -2803,14 +2803,14 @@ class DeviceBayListView(generic.ObjectListView): filterset_form = forms.DeviceBayFilterForm table = tables.DeviceBayTable template_name = 'dcim/component_list.html' - actions = ('add', 'import', 'export', 'bulk_edit', 'bulk_delete', 'bulk_rename') - action_perms = defaultdict(set, **{ + actions = { 'add': {'add'}, 'import': {'add'}, + 'export': set(), 'bulk_edit': {'change'}, 'bulk_delete': {'delete'}, 'bulk_rename': {'change'}, - }) + } @register_model_view(DeviceBay) @@ -2936,14 +2936,14 @@ class InventoryItemListView(generic.ObjectListView): filterset_form = forms.InventoryItemFilterForm table = tables.InventoryItemTable template_name = 'dcim/component_list.html' - actions = ('add', 'import', 'export', 'bulk_edit', 'bulk_delete', 'bulk_rename') - action_perms = defaultdict(set, **{ + actions = { 'add': {'add'}, 'import': {'add'}, + 'export': set(), 'bulk_edit': {'change'}, 'bulk_delete': {'delete'}, 'bulk_rename': {'change'}, - }) + } @register_model_view(InventoryItem) diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py index 173d7047b..d6461efe8 100644 --- a/netbox/virtualization/views.py +++ b/netbox/virtualization/views.py @@ -199,13 +199,13 @@ class ClusterDevicesView(generic.ObjectChildrenView): table = DeviceTable filterset = DeviceFilterSet template_name = 'virtualization/cluster/devices.html' - actions = ('add', 'import', 'export', 'bulk_edit', 'bulk_remove_devices') - action_perms = defaultdict(set, **{ + actions = { 'add': {'add'}, 'import': {'add'}, + 'export': set(), 'bulk_edit': {'change'}, 'bulk_remove_devices': {'change'}, - }) + } tab = ViewTab( label=_('Devices'), badge=lambda obj: obj.devices.count(), @@ -359,20 +359,20 @@ class VirtualMachineInterfacesView(generic.ObjectChildrenView): table = tables.VirtualMachineVMInterfaceTable filterset = filtersets.VMInterfaceFilterSet template_name = 'virtualization/virtualmachine/interfaces.html' + actions = { + 'add': {'add'}, + 'import': {'add'}, + 'export': set(), + 'bulk_edit': {'change'}, + 'bulk_delete': {'delete'}, + 'bulk_rename': {'change'}, + } tab = ViewTab( label=_('Interfaces'), badge=lambda obj: obj.interface_count, permission='virtualization.view_vminterface', weight=500 ) - actions = ('add', 'import', 'export', 'bulk_edit', 'bulk_delete', 'bulk_rename') - action_perms = defaultdict(set, **{ - 'add': {'add'}, - 'import': {'add'}, - 'bulk_edit': {'change'}, - 'bulk_delete': {'delete'}, - 'bulk_rename': {'change'}, - }) def get_children(self, request, parent): return parent.interfaces.restrict(request.user, 'view').prefetch_related(