1
0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00

Merge branch 'develop-2.9' into 554-object-permissions

This commit is contained in:
Jeremy Stretch
2020-05-11 12:48:36 -04:00
8 changed files with 115 additions and 114 deletions

View File

@@ -158,7 +158,7 @@ class RegionListView(PermissionRequiredMixin, ObjectListView):
class RegionCreateView(PermissionRequiredMixin, ObjectEditView):
permission_required = 'dcim.add_region'
model = Region
queryset = Region.objects.all()
model_form = forms.RegionForm
default_return_url = 'dcim:region_list'
@@ -221,7 +221,7 @@ class SiteView(PermissionRequiredMixin, View):
class SiteCreateView(PermissionRequiredMixin, ObjectEditView):
permission_required = 'dcim.add_site'
model = Site
queryset = Site.objects.all()
model_form = forms.SiteForm
template_name = 'dcim/site_edit.html'
default_return_url = 'dcim:site_list'
@@ -233,7 +233,7 @@ class SiteEditView(SiteCreateView):
class SiteDeleteView(PermissionRequiredMixin, ObjectDeleteView):
permission_required = 'dcim.delete_site'
model = Site
queryset = Site.objects.all()
default_return_url = 'dcim:site_list'
@@ -281,7 +281,7 @@ class RackGroupListView(PermissionRequiredMixin, ObjectListView):
class RackGroupCreateView(PermissionRequiredMixin, ObjectEditView):
permission_required = 'dcim.add_rackgroup'
model = RackGroup
queryset = RackGroup.objects.all()
model_form = forms.RackGroupForm
default_return_url = 'dcim:rackgroup_list'
@@ -317,7 +317,7 @@ class RackRoleListView(PermissionRequiredMixin, ObjectListView):
class RackRoleCreateView(PermissionRequiredMixin, ObjectEditView):
permission_required = 'dcim.add_rackrole'
model = RackRole
queryset = RackRole.objects.all()
model_form = forms.RackRoleForm
default_return_url = 'dcim:rackrole_list'
@@ -427,7 +427,7 @@ class RackView(PermissionRequiredMixin, View):
class RackCreateView(PermissionRequiredMixin, ObjectEditView):
permission_required = 'dcim.add_rack'
model = Rack
queryset = Rack.objects.all()
model_form = forms.RackForm
template_name = 'dcim/rack_edit.html'
default_return_url = 'dcim:rack_list'
@@ -439,7 +439,7 @@ class RackEditView(RackCreateView):
class RackDeleteView(PermissionRequiredMixin, ObjectDeleteView):
permission_required = 'dcim.delete_rack'
model = Rack
queryset = Rack.objects.all()
default_return_url = 'dcim:rack_list'
@@ -494,7 +494,7 @@ class RackReservationView(PermissionRequiredMixin, View):
class RackReservationCreateView(PermissionRequiredMixin, ObjectEditView):
permission_required = 'dcim.add_rackreservation'
model = RackReservation
queryset = RackReservation.objects.all()
model_form = forms.RackReservationForm
template_name = 'dcim/rackreservation_edit.html'
default_return_url = 'dcim:rackreservation_list'
@@ -513,7 +513,7 @@ class RackReservationEditView(RackReservationCreateView):
class RackReservationDeleteView(PermissionRequiredMixin, ObjectDeleteView):
permission_required = 'dcim.delete_rackreservation'
model = RackReservation
queryset = RackReservation.objects.all()
default_return_url = 'dcim:rackreservation_list'
@@ -567,7 +567,7 @@ class ManufacturerListView(PermissionRequiredMixin, ObjectListView):
class ManufacturerCreateView(PermissionRequiredMixin, ObjectEditView):
permission_required = 'dcim.add_manufacturer'
model = Manufacturer
queryset = Manufacturer.objects.all()
model_form = forms.ManufacturerForm
default_return_url = 'dcim:manufacturer_list'
@@ -667,7 +667,7 @@ class DeviceTypeView(PermissionRequiredMixin, View):
class DeviceTypeCreateView(PermissionRequiredMixin, ObjectEditView):
permission_required = 'dcim.add_devicetype'
model = DeviceType
queryset = DeviceType.objects.all()
model_form = forms.DeviceTypeForm
template_name = 'dcim/devicetype_edit.html'
default_return_url = 'dcim:devicetype_list'
@@ -679,7 +679,7 @@ class DeviceTypeEditView(DeviceTypeCreateView):
class DeviceTypeDeleteView(PermissionRequiredMixin, ObjectDeleteView):
permission_required = 'dcim.delete_devicetype'
model = DeviceType
queryset = DeviceType.objects.all()
default_return_url = 'dcim:devicetype_list'
@@ -741,13 +741,13 @@ class ConsolePortTemplateCreateView(PermissionRequiredMixin, ComponentCreateView
class ConsolePortTemplateEditView(PermissionRequiredMixin, ObjectEditView):
permission_required = 'dcim.change_consoleporttemplate'
model = ConsolePortTemplate
queryset = ConsolePortTemplate.objects.all()
model_form = forms.ConsolePortTemplateForm
class ConsolePortTemplateDeleteView(PermissionRequiredMixin, ObjectDeleteView):
permission_required = 'dcim.delete_consoleporttemplate'
model = ConsolePortTemplate
queryset = ConsolePortTemplate.objects.all()
class ConsolePortTemplateBulkEditView(PermissionRequiredMixin, BulkEditView):
@@ -777,13 +777,13 @@ class ConsoleServerPortTemplateCreateView(PermissionRequiredMixin, ComponentCrea
class ConsoleServerPortTemplateEditView(PermissionRequiredMixin, ObjectEditView):
permission_required = 'dcim.change_consoleserverporttemplate'
model = ConsoleServerPortTemplate
queryset = ConsoleServerPortTemplate.objects.all()
model_form = forms.ConsoleServerPortTemplateForm
class ConsoleServerPortTemplateDeleteView(PermissionRequiredMixin, ObjectDeleteView):
permission_required = 'dcim.delete_consoleserverporttemplate'
model = ConsoleServerPortTemplate
queryset = ConsoleServerPortTemplate.objects.all()
class ConsoleServerPortTemplateBulkEditView(PermissionRequiredMixin, BulkEditView):
@@ -813,13 +813,13 @@ class PowerPortTemplateCreateView(PermissionRequiredMixin, ComponentCreateView):
class PowerPortTemplateEditView(PermissionRequiredMixin, ObjectEditView):
permission_required = 'dcim.change_powerporttemplate'
model = PowerPortTemplate
queryset = PowerPortTemplate.objects.all()
model_form = forms.PowerPortTemplateForm
class PowerPortTemplateDeleteView(PermissionRequiredMixin, ObjectDeleteView):
permission_required = 'dcim.delete_powerporttemplate'
model = PowerPortTemplate
queryset = PowerPortTemplate.objects.all()
class PowerPortTemplateBulkEditView(PermissionRequiredMixin, BulkEditView):
@@ -849,13 +849,13 @@ class PowerOutletTemplateCreateView(PermissionRequiredMixin, ComponentCreateView
class PowerOutletTemplateEditView(PermissionRequiredMixin, ObjectEditView):
permission_required = 'dcim.change_poweroutlettemplate'
model = PowerOutletTemplate
queryset = PowerOutletTemplate.objects.all()
model_form = forms.PowerOutletTemplateForm
class PowerOutletTemplateDeleteView(PermissionRequiredMixin, ObjectDeleteView):
permission_required = 'dcim.delete_poweroutlettemplate'
model = PowerOutletTemplate
queryset = PowerOutletTemplate.objects.all()
class PowerOutletTemplateBulkEditView(PermissionRequiredMixin, BulkEditView):
@@ -885,13 +885,13 @@ class InterfaceTemplateCreateView(PermissionRequiredMixin, ComponentCreateView):
class InterfaceTemplateEditView(PermissionRequiredMixin, ObjectEditView):
permission_required = 'dcim.change_interfacetemplate'
model = InterfaceTemplate
queryset = InterfaceTemplate.objects.all()
model_form = forms.InterfaceTemplateForm
class InterfaceTemplateDeleteView(PermissionRequiredMixin, ObjectDeleteView):
permission_required = 'dcim.delete_interfacetemplate'
model = InterfaceTemplate
queryset = InterfaceTemplate.objects.all()
class InterfaceTemplateBulkEditView(PermissionRequiredMixin, BulkEditView):
@@ -921,13 +921,13 @@ class FrontPortTemplateCreateView(PermissionRequiredMixin, ComponentCreateView):
class FrontPortTemplateEditView(PermissionRequiredMixin, ObjectEditView):
permission_required = 'dcim.change_frontporttemplate'
model = FrontPortTemplate
queryset = FrontPortTemplate.objects.all()
model_form = forms.FrontPortTemplateForm
class FrontPortTemplateDeleteView(PermissionRequiredMixin, ObjectDeleteView):
permission_required = 'dcim.delete_frontporttemplate'
model = FrontPortTemplate
queryset = FrontPortTemplate.objects.all()
class FrontPortTemplateBulkEditView(PermissionRequiredMixin, BulkEditView):
@@ -957,13 +957,13 @@ class RearPortTemplateCreateView(PermissionRequiredMixin, ComponentCreateView):
class RearPortTemplateEditView(PermissionRequiredMixin, ObjectEditView):
permission_required = 'dcim.change_rearporttemplate'
model = RearPortTemplate
queryset = RearPortTemplate.objects.all()
model_form = forms.RearPortTemplateForm
class RearPortTemplateDeleteView(PermissionRequiredMixin, ObjectDeleteView):
permission_required = 'dcim.delete_rearporttemplate'
model = RearPortTemplate
queryset = RearPortTemplate.objects.all()
class RearPortTemplateBulkEditView(PermissionRequiredMixin, BulkEditView):
@@ -993,13 +993,13 @@ class DeviceBayTemplateCreateView(PermissionRequiredMixin, ComponentCreateView):
class DeviceBayTemplateEditView(PermissionRequiredMixin, ObjectEditView):
permission_required = 'dcim.change_devicebaytemplate'
model = DeviceBayTemplate
queryset = DeviceBayTemplate.objects.all()
model_form = forms.DeviceBayTemplateForm
class DeviceBayTemplateDeleteView(PermissionRequiredMixin, ObjectDeleteView):
permission_required = 'dcim.delete_devicebaytemplate'
model = DeviceBayTemplate
queryset = DeviceBayTemplate.objects.all()
# class DeviceBayTemplateBulkEditView(PermissionRequiredMixin, BulkEditView):
@@ -1027,7 +1027,7 @@ class DeviceRoleListView(PermissionRequiredMixin, ObjectListView):
class DeviceRoleCreateView(PermissionRequiredMixin, ObjectEditView):
permission_required = 'dcim.add_devicerole'
model = DeviceRole
queryset = DeviceRole.objects.all()
model_form = forms.DeviceRoleForm
default_return_url = 'dcim:devicerole_list'
@@ -1062,7 +1062,7 @@ class PlatformListView(PermissionRequiredMixin, ObjectListView):
class PlatformCreateView(PermissionRequiredMixin, ObjectEditView):
permission_required = 'dcim.add_platform'
model = Platform
queryset = Platform.objects.all()
model_form = forms.PlatformForm
default_return_url = 'dcim:platform_list'
@@ -1248,7 +1248,7 @@ class DeviceConfigContextView(PermissionRequiredMixin, ObjectConfigContextView):
class DeviceCreateView(PermissionRequiredMixin, ObjectEditView):
permission_required = 'dcim.add_device'
model = Device
queryset = Device.objects.all()
model_form = forms.DeviceForm
template_name = 'dcim/device_edit.html'
default_return_url = 'dcim:device_list'
@@ -1260,7 +1260,7 @@ class DeviceEditView(DeviceCreateView):
class DeviceDeleteView(PermissionRequiredMixin, ObjectDeleteView):
permission_required = 'dcim.delete_device'
model = Device
queryset = Device.objects.all()
default_return_url = 'dcim:device_list'
@@ -1331,13 +1331,13 @@ class ConsolePortCreateView(PermissionRequiredMixin, ComponentCreateView):
class ConsolePortEditView(PermissionRequiredMixin, ObjectEditView):
permission_required = 'dcim.change_consoleport'
model = ConsolePort
queryset = ConsolePort.objects.all()
model_form = forms.ConsolePortForm
class ConsolePortDeleteView(PermissionRequiredMixin, ObjectDeleteView):
permission_required = 'dcim.delete_consoleport'
model = ConsolePort
queryset = ConsolePort.objects.all()
class ConsolePortBulkImportView(PermissionRequiredMixin, BulkImportView):
@@ -1386,13 +1386,13 @@ class ConsoleServerPortCreateView(PermissionRequiredMixin, ComponentCreateView):
class ConsoleServerPortEditView(PermissionRequiredMixin, ObjectEditView):
permission_required = 'dcim.change_consoleserverport'
model = ConsoleServerPort
queryset = ConsoleServerPort.objects.all()
model_form = forms.ConsoleServerPortForm
class ConsoleServerPortDeleteView(PermissionRequiredMixin, ObjectDeleteView):
permission_required = 'dcim.delete_consoleserverport'
model = ConsoleServerPort
queryset = ConsoleServerPort.objects.all()
class ConsoleServerPortBulkImportView(PermissionRequiredMixin, BulkImportView):
@@ -1453,13 +1453,13 @@ class PowerPortCreateView(PermissionRequiredMixin, ComponentCreateView):
class PowerPortEditView(PermissionRequiredMixin, ObjectEditView):
permission_required = 'dcim.change_powerport'
model = PowerPort
queryset = PowerPort.objects.all()
model_form = forms.PowerPortForm
class PowerPortDeleteView(PermissionRequiredMixin, ObjectDeleteView):
permission_required = 'dcim.delete_powerport'
model = PowerPort
queryset = PowerPort.objects.all()
class PowerPortBulkImportView(PermissionRequiredMixin, BulkImportView):
@@ -1508,13 +1508,13 @@ class PowerOutletCreateView(PermissionRequiredMixin, ComponentCreateView):
class PowerOutletEditView(PermissionRequiredMixin, ObjectEditView):
permission_required = 'dcim.change_poweroutlet'
model = PowerOutlet
queryset = PowerOutlet.objects.all()
model_form = forms.PowerOutletForm
class PowerOutletDeleteView(PermissionRequiredMixin, ObjectDeleteView):
permission_required = 'dcim.delete_poweroutlet'
model = PowerOutlet
queryset = PowerOutlet.objects.all()
class PowerOutletBulkImportView(PermissionRequiredMixin, BulkImportView):
@@ -1611,14 +1611,14 @@ class InterfaceCreateView(PermissionRequiredMixin, ComponentCreateView):
class InterfaceEditView(PermissionRequiredMixin, ObjectEditView):
permission_required = 'dcim.change_interface'
model = Interface
queryset = Interface.objects.all()
model_form = forms.InterfaceForm
template_name = 'dcim/interface_edit.html'
class InterfaceDeleteView(PermissionRequiredMixin, ObjectDeleteView):
permission_required = 'dcim.delete_interface'
model = Interface
queryset = Interface.objects.all()
class InterfaceBulkImportView(PermissionRequiredMixin, BulkImportView):
@@ -1679,13 +1679,13 @@ class FrontPortCreateView(PermissionRequiredMixin, ComponentCreateView):
class FrontPortEditView(PermissionRequiredMixin, ObjectEditView):
permission_required = 'dcim.change_frontport'
model = FrontPort
queryset = FrontPort.objects.all()
model_form = forms.FrontPortForm
class FrontPortDeleteView(PermissionRequiredMixin, ObjectDeleteView):
permission_required = 'dcim.delete_frontport'
model = FrontPort
queryset = FrontPort.objects.all()
class FrontPortBulkImportView(PermissionRequiredMixin, BulkImportView):
@@ -1746,13 +1746,13 @@ class RearPortCreateView(PermissionRequiredMixin, ComponentCreateView):
class RearPortEditView(PermissionRequiredMixin, ObjectEditView):
permission_required = 'dcim.change_rearport'
model = RearPort
queryset = RearPort.objects.all()
model_form = forms.RearPortForm
class RearPortDeleteView(PermissionRequiredMixin, ObjectDeleteView):
permission_required = 'dcim.delete_rearport'
model = RearPort
queryset = RearPort.objects.all()
class RearPortBulkImportView(PermissionRequiredMixin, BulkImportView):
@@ -1815,13 +1815,13 @@ class DeviceBayCreateView(PermissionRequiredMixin, ComponentCreateView):
class DeviceBayEditView(PermissionRequiredMixin, ObjectEditView):
permission_required = 'dcim.change_devicebay'
model = DeviceBay
queryset = DeviceBay.objects.all()
model_form = forms.DeviceBayForm
class DeviceBayDeleteView(PermissionRequiredMixin, ObjectDeleteView):
permission_required = 'dcim.delete_devicebay'
model = DeviceBay
queryset = DeviceBay.objects.all()
class DeviceBayPopulateView(PermissionRequiredMixin, View):
@@ -2155,7 +2155,7 @@ class CableCreateView(PermissionRequiredMixin, GetReturnURLMixin, View):
class CableEditView(PermissionRequiredMixin, ObjectEditView):
permission_required = 'dcim.change_cable'
model = Cable
queryset = Cable.objects.all()
model_form = forms.CableForm
template_name = 'dcim/cable_edit.html'
default_return_url = 'dcim:cable_list'
@@ -2163,7 +2163,7 @@ class CableEditView(PermissionRequiredMixin, ObjectEditView):
class CableDeleteView(PermissionRequiredMixin, ObjectDeleteView):
permission_required = 'dcim.delete_cable'
model = Cable
queryset = Cable.objects.all()
default_return_url = 'dcim:cable_list'
@@ -2310,7 +2310,7 @@ class InventoryItemListView(PermissionRequiredMixin, ObjectListView):
class InventoryItemEditView(PermissionRequiredMixin, ObjectEditView):
permission_required = 'dcim.change_inventoryitem'
model = InventoryItem
queryset = InventoryItem.objects.all()
model_form = forms.InventoryItemForm
@@ -2324,7 +2324,7 @@ class InventoryItemCreateView(PermissionRequiredMixin, ComponentCreateView):
class InventoryItemDeleteView(PermissionRequiredMixin, ObjectDeleteView):
permission_required = 'dcim.delete_inventoryitem'
model = InventoryItem
queryset = InventoryItem.objects.all()
class InventoryItemBulkImportView(PermissionRequiredMixin, BulkImportView):
@@ -2497,7 +2497,7 @@ class VirtualChassisEditView(PermissionRequiredMixin, GetReturnURLMixin, View):
class VirtualChassisDeleteView(PermissionRequiredMixin, ObjectDeleteView):
permission_required = 'dcim.delete_virtualchassis'
model = VirtualChassis
queryset = VirtualChassis.objects.all()
default_return_url = 'dcim:device_list'
@@ -2655,7 +2655,7 @@ class PowerPanelView(PermissionRequiredMixin, View):
class PowerPanelCreateView(PermissionRequiredMixin, ObjectEditView):
permission_required = 'dcim.add_powerpanel'
model = PowerPanel
queryset = PowerPanel.objects.all()
model_form = forms.PowerPanelForm
default_return_url = 'dcim:powerpanel_list'
@@ -2666,7 +2666,7 @@ class PowerPanelEditView(PowerPanelCreateView):
class PowerPanelDeleteView(PermissionRequiredMixin, ObjectDeleteView):
permission_required = 'dcim.delete_powerpanel'
model = PowerPanel
queryset = PowerPanel.objects.all()
default_return_url = 'dcim:powerpanel_list'
@@ -2726,7 +2726,7 @@ class PowerFeedView(PermissionRequiredMixin, View):
class PowerFeedCreateView(PermissionRequiredMixin, ObjectEditView):
permission_required = 'dcim.add_powerfeed'
model = PowerFeed
queryset = PowerFeed.objects.all()
model_form = forms.PowerFeedForm
template_name = 'dcim/powerfeed_edit.html'
default_return_url = 'dcim:powerfeed_list'
@@ -2738,7 +2738,7 @@ class PowerFeedEditView(PowerFeedCreateView):
class PowerFeedDeleteView(PermissionRequiredMixin, ObjectDeleteView):
permission_required = 'dcim.delete_powerfeed'
model = PowerFeed
queryset = PowerFeed.objects.all()
default_return_url = 'dcim:powerfeed_list'