From 52420945b234edff12076384be10e2b102b2e57f Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Mon, 23 Jan 2017 14:07:26 -0500 Subject: [PATCH] Standardized naming of return_url for all object views --- netbox/circuits/views.py | 20 ++-- netbox/dcim/views.py | 96 ++++++++++--------- netbox/ipam/views.py | 54 +++++------ netbox/secrets/views.py | 12 +-- netbox/templates/circuits/circuit_import.html | 2 +- .../circuits/circuittermination_edit.html | 2 +- .../templates/circuits/provider_import.html | 2 +- .../templates/dcim/consoleport_connect.html | 2 +- .../dcim/consoleserverport_connect.html | 2 +- .../dcim/device_bulk_add_component.html | 6 +- .../templates/dcim/device_component_add.html | 2 +- netbox/templates/dcim/device_import.html | 2 +- .../templates/dcim/device_import_child.html | 2 +- netbox/templates/dcim/devicebay_populate.html | 2 +- .../dcim/devicetype_component_add.html | 2 +- netbox/templates/dcim/inc/consoleport.html | 2 +- .../templates/dcim/inc/consoleserverport.html | 2 +- netbox/templates/dcim/inc/devicebay.html | 2 +- netbox/templates/dcim/inc/interface.html | 2 +- netbox/templates/dcim/inc/poweroutlet.html | 2 +- netbox/templates/dcim/inc/powerport.html | 2 +- .../dcim/interfaceconnection_edit.html | 2 +- netbox/templates/dcim/ipaddress_assign.html | 2 +- .../templates/dcim/poweroutlet_connect.html | 2 +- netbox/templates/dcim/powerport_connect.html | 2 +- netbox/templates/dcim/rack_import.html | 2 +- netbox/templates/dcim/site_import.html | 2 +- netbox/templates/ipam/aggregate_import.html | 2 +- netbox/templates/ipam/ipaddress_assign.html | 2 +- netbox/templates/ipam/ipaddress_import.html | 2 +- netbox/templates/ipam/prefix_import.html | 2 +- netbox/templates/ipam/vlan_import.html | 2 +- netbox/templates/ipam/vrf_import.html | 2 +- netbox/templates/secrets/secret_edit.html | 2 +- netbox/templates/secrets/secret_import.html | 2 +- netbox/templates/tenancy/tenant_import.html | 2 +- .../templates/utilities/bulk_edit_form.html | 6 +- .../utilities/confirmation_form.html | 2 +- netbox/templates/utilities/obj_edit.html | 2 +- netbox/templates/utilities/obj_table.html | 2 +- netbox/tenancy/views.py | 10 +- netbox/utilities/views.py | 88 ++++++++--------- 42 files changed, 181 insertions(+), 179 deletions(-) diff --git a/netbox/circuits/views.py b/netbox/circuits/views.py index 4387cae36..c5fae7384 100644 --- a/netbox/circuits/views.py +++ b/netbox/circuits/views.py @@ -47,7 +47,7 @@ class ProviderEditView(PermissionRequiredMixin, ObjectEditView): model = Provider form_class = forms.ProviderForm template_name = 'circuits/provider_edit.html' - obj_list_url = 'circuits:provider_list' + default_return_url = 'circuits:provider_list' class ProviderDeleteView(PermissionRequiredMixin, ObjectDeleteView): @@ -61,7 +61,7 @@ class ProviderBulkImportView(PermissionRequiredMixin, BulkImportView): form = forms.ProviderImportForm table = tables.ProviderTable template_name = 'circuits/provider_import.html' - obj_list_url = 'circuits:provider_list' + default_return_url = 'circuits:provider_list' class ProviderBulkEditView(PermissionRequiredMixin, BulkEditView): @@ -70,14 +70,14 @@ class ProviderBulkEditView(PermissionRequiredMixin, BulkEditView): filter = filters.ProviderFilter form = forms.ProviderBulkEditForm template_name = 'circuits/provider_bulk_edit.html' - default_redirect_url = 'circuits:provider_list' + default_return_url = 'circuits:provider_list' class ProviderBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'circuits.delete_provider' cls = Provider filter = filters.ProviderFilter - default_redirect_url = 'circuits:provider_list' + default_return_url = 'circuits:provider_list' # @@ -103,7 +103,7 @@ class CircuitTypeEditView(PermissionRequiredMixin, ObjectEditView): class CircuitTypeBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'circuits.delete_circuittype' cls = CircuitType - default_redirect_url = 'circuits:circuittype_list' + default_return_url = 'circuits:circuittype_list' # @@ -138,7 +138,7 @@ class CircuitEditView(PermissionRequiredMixin, ObjectEditView): form_class = forms.CircuitForm fields_initial = ['provider'] template_name = 'circuits/circuit_edit.html' - obj_list_url = 'circuits:circuit_list' + default_return_url = 'circuits:circuit_list' class CircuitDeleteView(PermissionRequiredMixin, ObjectDeleteView): @@ -152,7 +152,7 @@ class CircuitBulkImportView(PermissionRequiredMixin, BulkImportView): form = forms.CircuitImportForm table = tables.CircuitTable template_name = 'circuits/circuit_import.html' - obj_list_url = 'circuits:circuit_list' + default_return_url = 'circuits:circuit_list' class CircuitBulkEditView(PermissionRequiredMixin, BulkEditView): @@ -161,14 +161,14 @@ class CircuitBulkEditView(PermissionRequiredMixin, BulkEditView): filter = filters.CircuitFilter form = forms.CircuitBulkEditForm template_name = 'circuits/circuit_bulk_edit.html' - default_redirect_url = 'circuits:circuit_list' + default_return_url = 'circuits:circuit_list' class CircuitBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'circuits.delete_circuit' cls = Circuit filter = filters.CircuitFilter - default_redirect_url = 'circuits:circuit_list' + default_return_url = 'circuits:circuit_list' @permission_required('circuits.change_circuittermination') @@ -212,7 +212,7 @@ def circuit_terminations_swap(request, pk): 'form': form, 'panel_class': 'default', 'button_class': 'primary', - 'cancel_url': circuit.get_absolute_url(), + 'return_url': circuit.get_absolute_url(), }) diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py index fcbab54c8..b98252747 100644 --- a/netbox/dcim/views.py +++ b/netbox/dcim/views.py @@ -71,7 +71,7 @@ class ComponentCreateView(View): 'parent': parent, 'component_type': self.model._meta.verbose_name, 'form': self.form(initial=request.GET), - 'cancel_url': parent.get_absolute_url(), + 'return_url': parent.get_absolute_url(), }) def post(self, request, pk): @@ -112,7 +112,7 @@ class ComponentCreateView(View): 'parent': parent, 'component_type': self.model._meta.verbose_name, 'form': form, - 'cancel_url': parent.get_absolute_url(), + 'return_url': parent.get_absolute_url(), }) @@ -122,6 +122,12 @@ class ComponentEditView(ObjectEditView): return obj.device.get_absolute_url() +class ComponentDeleteView(ObjectDeleteView): + + def get_return_url(self, obj): + return obj.device.get_absolute_url() + + # # Sites # @@ -163,7 +169,7 @@ class SiteEditView(PermissionRequiredMixin, ObjectEditView): model = Site form_class = forms.SiteForm template_name = 'dcim/site_edit.html' - obj_list_url = 'dcim:site_list' + default_return_url = 'dcim:site_list' class SiteDeleteView(PermissionRequiredMixin, ObjectDeleteView): @@ -177,7 +183,7 @@ class SiteBulkImportView(PermissionRequiredMixin, BulkImportView): form = forms.SiteImportForm table = tables.SiteTable template_name = 'dcim/site_import.html' - obj_list_url = 'dcim:site_list' + default_return_url = 'dcim:site_list' class SiteBulkEditView(PermissionRequiredMixin, BulkEditView): @@ -186,7 +192,7 @@ class SiteBulkEditView(PermissionRequiredMixin, BulkEditView): filter = filters.SiteFilter form = forms.SiteBulkEditForm template_name = 'dcim/site_bulk_edit.html' - default_redirect_url = 'dcim:site_list' + default_return_url = 'dcim:site_list' # @@ -215,7 +221,7 @@ class RackGroupBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'dcim.delete_rackgroup' cls = RackGroup filter = filters.RackGroupFilter - default_redirect_url = 'dcim:rackgroup_list' + default_return_url = 'dcim:rackgroup_list' # @@ -241,7 +247,7 @@ class RackRoleEditView(PermissionRequiredMixin, ObjectEditView): class RackRoleBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'dcim.delete_rackrole' cls = RackRole - default_redirect_url = 'dcim:rackrole_list' + default_return_url = 'dcim:rackrole_list' # @@ -282,7 +288,7 @@ class RackEditView(PermissionRequiredMixin, ObjectEditView): model = Rack form_class = forms.RackForm template_name = 'dcim/rack_edit.html' - obj_list_url = 'dcim:rack_list' + default_return_url = 'dcim:rack_list' class RackDeleteView(PermissionRequiredMixin, ObjectDeleteView): @@ -296,7 +302,7 @@ class RackBulkImportView(PermissionRequiredMixin, BulkImportView): form = forms.RackImportForm table = tables.RackImportTable template_name = 'dcim/rack_import.html' - obj_list_url = 'dcim:rack_list' + default_return_url = 'dcim:rack_list' class RackBulkEditView(PermissionRequiredMixin, BulkEditView): @@ -305,14 +311,14 @@ class RackBulkEditView(PermissionRequiredMixin, BulkEditView): filter = filters.RackFilter form = forms.RackBulkEditForm template_name = 'dcim/rack_bulk_edit.html' - default_redirect_url = 'dcim:rack_list' + default_return_url = 'dcim:rack_list' class RackBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'dcim.delete_rack' cls = Rack filter = filters.RackFilter - default_redirect_url = 'dcim:rack_list' + default_return_url = 'dcim:rack_list' # @@ -338,7 +344,7 @@ class ManufacturerEditView(PermissionRequiredMixin, ObjectEditView): class ManufacturerBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'dcim.delete_manufacturer' cls = Manufacturer - default_redirect_url = 'dcim:manufacturer_list' + default_return_url = 'dcim:manufacturer_list' # @@ -408,7 +414,7 @@ class DeviceTypeEditView(PermissionRequiredMixin, ObjectEditView): model = DeviceType form_class = forms.DeviceTypeForm template_name = 'dcim/devicetype_edit.html' - obj_list_url = 'dcim:devicetype_list' + default_return_url = 'dcim:devicetype_list' class DeviceTypeDeleteView(PermissionRequiredMixin, ObjectDeleteView): @@ -423,14 +429,14 @@ class DeviceTypeBulkEditView(PermissionRequiredMixin, BulkEditView): filter = filters.DeviceTypeFilter form = forms.DeviceTypeBulkEditForm template_name = 'dcim/devicetype_bulk_edit.html' - default_redirect_url = 'dcim:devicetype_list' + default_return_url = 'dcim:devicetype_list' class DeviceTypeBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'dcim.delete_devicetype' cls = DeviceType filter = filters.DeviceTypeFilter - default_redirect_url = 'dcim:devicetype_list' + default_return_url = 'dcim:devicetype_list' # @@ -560,7 +566,7 @@ class DeviceRoleEditView(PermissionRequiredMixin, ObjectEditView): class DeviceRoleBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'dcim.delete_devicerole' cls = DeviceRole - default_redirect_url = 'dcim:devicerole_list' + default_return_url = 'dcim:devicerole_list' # @@ -586,7 +592,7 @@ class PlatformEditView(PermissionRequiredMixin, ObjectEditView): class PlatformBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'dcim.delete_platform' cls = Platform - default_redirect_url = 'dcim:platform_list' + default_return_url = 'dcim:platform_list' # @@ -678,7 +684,7 @@ class DeviceEditView(PermissionRequiredMixin, ObjectEditView): form_class = forms.DeviceForm fields_initial = ['site', 'rack', 'position', 'face', 'device_bay'] template_name = 'dcim/device_edit.html' - obj_list_url = 'dcim:device_list' + default_return_url = 'dcim:device_list' class DeviceDeleteView(PermissionRequiredMixin, ObjectDeleteView): @@ -692,7 +698,7 @@ class DeviceBulkImportView(PermissionRequiredMixin, BulkImportView): form = forms.DeviceImportForm table = tables.DeviceImportTable template_name = 'dcim/device_import.html' - obj_list_url = 'dcim:device_list' + default_return_url = 'dcim:device_list' class ChildDeviceBulkImportView(PermissionRequiredMixin, BulkImportView): @@ -700,7 +706,7 @@ class ChildDeviceBulkImportView(PermissionRequiredMixin, BulkImportView): form = forms.ChildDeviceImportForm table = tables.DeviceImportTable template_name = 'dcim/device_import_child.html' - obj_list_url = 'dcim:device_list' + default_return_url = 'dcim:device_list' def save_obj(self, obj): # Inherent rack from parent device @@ -718,14 +724,14 @@ class DeviceBulkEditView(PermissionRequiredMixin, BulkEditView): filter = filters.DeviceFilter form = forms.DeviceBulkEditForm template_name = 'dcim/device_bulk_edit.html' - default_redirect_url = 'dcim:device_list' + default_return_url = 'dcim:device_list' class DeviceBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'dcim.delete_device' cls = Device filter = filters.DeviceFilter - default_redirect_url = 'dcim:device_list' + default_return_url = 'dcim:device_list' def device_inventory(request, pk): @@ -790,7 +796,7 @@ def consoleport_connect(request, pk): return render(request, 'dcim/consoleport_connect.html', { 'consoleport': consoleport, 'form': form, - 'cancel_url': reverse('dcim:device', kwargs={'pk': consoleport.device.pk}), + 'return_url': reverse('dcim:device', kwargs={'pk': consoleport.device.pk}), }) @@ -819,7 +825,7 @@ def consoleport_disconnect(request, pk): return render(request, 'dcim/consoleport_disconnect.html', { 'consoleport': consoleport, 'form': form, - 'cancel_url': reverse('dcim:device', kwargs={'pk': consoleport.device.pk}), + 'return_url': reverse('dcim:device', kwargs={'pk': consoleport.device.pk}), }) @@ -829,7 +835,7 @@ class ConsolePortEditView(PermissionRequiredMixin, ComponentEditView): form_class = forms.ConsolePortForm -class ConsolePortDeleteView(PermissionRequiredMixin, ObjectDeleteView): +class ConsolePortDeleteView(PermissionRequiredMixin, ComponentDeleteView): permission_required = 'dcim.delete_consoleport' model = ConsolePort @@ -886,7 +892,7 @@ def consoleserverport_connect(request, pk): return render(request, 'dcim/consoleserverport_connect.html', { 'consoleserverport': consoleserverport, 'form': form, - 'cancel_url': reverse('dcim:device', kwargs={'pk': consoleserverport.device.pk}), + 'return_url': reverse('dcim:device', kwargs={'pk': consoleserverport.device.pk}), }) @@ -916,7 +922,7 @@ def consoleserverport_disconnect(request, pk): return render(request, 'dcim/consoleserverport_disconnect.html', { 'consoleserverport': consoleserverport, 'form': form, - 'cancel_url': reverse('dcim:device', kwargs={'pk': consoleserverport.device.pk}), + 'return_url': reverse('dcim:device', kwargs={'pk': consoleserverport.device.pk}), }) @@ -926,7 +932,7 @@ class ConsoleServerPortEditView(PermissionRequiredMixin, ComponentEditView): form_class = forms.ConsoleServerPortForm -class ConsoleServerPortDeleteView(PermissionRequiredMixin, ObjectDeleteView): +class ConsoleServerPortDeleteView(PermissionRequiredMixin, ComponentDeleteView): permission_required = 'dcim.delete_consoleserverport' model = ConsoleServerPort @@ -976,7 +982,7 @@ def powerport_connect(request, pk): return render(request, 'dcim/powerport_connect.html', { 'powerport': powerport, 'form': form, - 'cancel_url': reverse('dcim:device', kwargs={'pk': powerport.device.pk}), + 'return_url': reverse('dcim:device', kwargs={'pk': powerport.device.pk}), }) @@ -1005,7 +1011,7 @@ def powerport_disconnect(request, pk): return render(request, 'dcim/powerport_disconnect.html', { 'powerport': powerport, 'form': form, - 'cancel_url': reverse('dcim:device', kwargs={'pk': powerport.device.pk}), + 'return_url': reverse('dcim:device', kwargs={'pk': powerport.device.pk}), }) @@ -1015,7 +1021,7 @@ class PowerPortEditView(PermissionRequiredMixin, ComponentEditView): form_class = forms.PowerPortForm -class PowerPortDeleteView(PermissionRequiredMixin, ObjectDeleteView): +class PowerPortDeleteView(PermissionRequiredMixin, ComponentDeleteView): permission_required = 'dcim.delete_powerport' model = PowerPort @@ -1072,7 +1078,7 @@ def poweroutlet_connect(request, pk): return render(request, 'dcim/poweroutlet_connect.html', { 'poweroutlet': poweroutlet, 'form': form, - 'cancel_url': reverse('dcim:device', kwargs={'pk': poweroutlet.device.pk}), + 'return_url': reverse('dcim:device', kwargs={'pk': poweroutlet.device.pk}), }) @@ -1101,7 +1107,7 @@ def poweroutlet_disconnect(request, pk): return render(request, 'dcim/poweroutlet_disconnect.html', { 'poweroutlet': poweroutlet, 'form': form, - 'cancel_url': reverse('dcim:device', kwargs={'pk': poweroutlet.device.pk}), + 'return_url': reverse('dcim:device', kwargs={'pk': poweroutlet.device.pk}), }) @@ -1111,7 +1117,7 @@ class PowerOutletEditView(PermissionRequiredMixin, ComponentEditView): form_class = forms.PowerOutletForm -class PowerOutletDeleteView(PermissionRequiredMixin, ObjectDeleteView): +class PowerOutletDeleteView(PermissionRequiredMixin, ComponentDeleteView): permission_required = 'dcim.delete_poweroutlet' model = PowerOutlet @@ -1141,7 +1147,7 @@ class InterfaceEditView(PermissionRequiredMixin, ComponentEditView): form_class = forms.InterfaceForm -class InterfaceDeleteView(PermissionRequiredMixin, ObjectDeleteView): +class InterfaceDeleteView(PermissionRequiredMixin, ComponentDeleteView): permission_required = 'dcim.delete_interface' model = Interface @@ -1179,7 +1185,7 @@ class DeviceBayEditView(PermissionRequiredMixin, ComponentEditView): form_class = forms.DeviceBayForm -class DeviceBayDeleteView(PermissionRequiredMixin, ObjectDeleteView): +class DeviceBayDeleteView(PermissionRequiredMixin, ComponentDeleteView): permission_required = 'dcim.delete_devicebay' model = DeviceBay @@ -1206,7 +1212,7 @@ def devicebay_populate(request, pk): return render(request, 'dcim/devicebay_populate.html', { 'device_bay': device_bay, 'form': form, - 'cancel_url': reverse('dcim:device', kwargs={'pk': device_bay.device.pk}), + 'return_url': reverse('dcim:device', kwargs={'pk': device_bay.device.pk}), }) @@ -1230,7 +1236,7 @@ def devicebay_depopulate(request, pk): return render(request, 'dcim/devicebay_depopulate.html', { 'device_bay': device_bay, 'form': form, - 'cancel_url': reverse('dcim:device', kwargs={'pk': device_bay.device.pk}), + 'return_url': reverse('dcim:device', kwargs={'pk': device_bay.device.pk}), }) @@ -1305,7 +1311,7 @@ class DeviceBulkAddComponentView(View): 'form': form, 'component_name': self.model._meta.verbose_name_plural, 'selected_devices': selected_devices, - 'cancel_url': reverse('dcim:device_list'), + 'return_url': reverse('dcim:device_list'), }) @@ -1387,7 +1393,7 @@ def interfaceconnection_add(request, pk): return render(request, 'dcim/interfaceconnection_edit.html', { 'device': device, 'form': form, - 'cancel_url': reverse('dcim:device', kwargs={'pk': device.pk}), + 'return_url': reverse('dcim:device', kwargs={'pk': device.pk}), }) @@ -1419,15 +1425,15 @@ def interfaceconnection_delete(request, pk): # Determine where to direct user upon cancellation if device_id: - cancel_url = reverse('dcim:device', kwargs={'pk': device_id}) + return_url = reverse('dcim:device', kwargs={'pk': device_id}) else: - cancel_url = reverse('dcim:device_list') + return_url = reverse('dcim:device_list') return render(request, 'dcim/interfaceconnection_delete.html', { 'interfaceconnection': interfaceconnection, 'device_id': device_id, 'form': form, - 'cancel_url': cancel_url, + 'return_url': return_url, }) @@ -1506,7 +1512,7 @@ def ipaddress_assign(request, pk): return render(request, 'dcim/ipaddress_assign.html', { 'device': device, 'form': form, - 'cancel_url': reverse('dcim:device', kwargs={'pk': device.pk}), + 'return_url': reverse('dcim:device', kwargs={'pk': device.pk}), }) @@ -1525,6 +1531,6 @@ class ModuleEditView(PermissionRequiredMixin, ComponentEditView): return obj -class ModuleDeleteView(PermissionRequiredMixin, ObjectDeleteView): +class ModuleDeleteView(PermissionRequiredMixin, ComponentDeleteView): permission_required = 'dcim.delete_module' model = Module diff --git a/netbox/ipam/views.py b/netbox/ipam/views.py index 32f7cea30..a56e691c7 100644 --- a/netbox/ipam/views.py +++ b/netbox/ipam/views.py @@ -118,7 +118,7 @@ class VRFEditView(PermissionRequiredMixin, ObjectEditView): model = VRF form_class = forms.VRFForm template_name = 'ipam/vrf_edit.html' - obj_list_url = 'ipam:vrf_list' + default_return_url = 'ipam:vrf_list' class VRFDeleteView(PermissionRequiredMixin, ObjectDeleteView): @@ -132,7 +132,7 @@ class VRFBulkImportView(PermissionRequiredMixin, BulkImportView): form = forms.VRFImportForm table = tables.VRFTable template_name = 'ipam/vrf_import.html' - obj_list_url = 'ipam:vrf_list' + default_return_url = 'ipam:vrf_list' class VRFBulkEditView(PermissionRequiredMixin, BulkEditView): @@ -141,14 +141,14 @@ class VRFBulkEditView(PermissionRequiredMixin, BulkEditView): filter = filters.VRFFilter form = forms.VRFBulkEditForm template_name = 'ipam/vrf_bulk_edit.html' - default_redirect_url = 'ipam:vrf_list' + default_return_url = 'ipam:vrf_list' class VRFBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'ipam.delete_vrf' cls = VRF filter = filters.VRFFilter - default_redirect_url = 'ipam:vrf_list' + default_return_url = 'ipam:vrf_list' # @@ -253,7 +253,7 @@ class RIRBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'ipam.delete_rir' cls = RIR filter = filters.RIRFilter - default_redirect_url = 'ipam:rir_list' + default_return_url = 'ipam:rir_list' # @@ -311,7 +311,7 @@ class AggregateEditView(PermissionRequiredMixin, ObjectEditView): model = Aggregate form_class = forms.AggregateForm template_name = 'ipam/aggregate_edit.html' - obj_list_url = 'ipam:aggregate_list' + default_return_url = 'ipam:aggregate_list' class AggregateDeleteView(PermissionRequiredMixin, ObjectDeleteView): @@ -325,7 +325,7 @@ class AggregateBulkImportView(PermissionRequiredMixin, BulkImportView): form = forms.AggregateImportForm table = tables.AggregateTable template_name = 'ipam/aggregate_import.html' - obj_list_url = 'ipam:aggregate_list' + default_return_url = 'ipam:aggregate_list' class AggregateBulkEditView(PermissionRequiredMixin, BulkEditView): @@ -334,14 +334,14 @@ class AggregateBulkEditView(PermissionRequiredMixin, BulkEditView): filter = filters.AggregateFilter form = forms.AggregateBulkEditForm template_name = 'ipam/aggregate_bulk_edit.html' - default_redirect_url = 'ipam:aggregate_list' + default_return_url = 'ipam:aggregate_list' class AggregateBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'ipam.delete_aggregate' cls = Aggregate filter = filters.AggregateFilter - default_redirect_url = 'ipam:aggregate_list' + default_return_url = 'ipam:aggregate_list' # @@ -367,7 +367,7 @@ class RoleEditView(PermissionRequiredMixin, ObjectEditView): class RoleBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'ipam.delete_role' cls = Role - default_redirect_url = 'ipam:role_list' + default_return_url = 'ipam:role_list' # @@ -444,14 +444,14 @@ class PrefixEditView(PermissionRequiredMixin, ObjectEditView): form_class = forms.PrefixForm template_name = 'ipam/prefix_edit.html' fields_initial = ['vrf', 'tenant', 'site', 'prefix', 'vlan'] - obj_list_url = 'ipam:prefix_list' + default_return_url = 'ipam:prefix_list' class PrefixDeleteView(PermissionRequiredMixin, ObjectDeleteView): permission_required = 'ipam.delete_prefix' model = Prefix - default_return_url = 'ipam:prefix_list' template_name = 'ipam/prefix_delete.html' + default_return_url = 'ipam:prefix_list' class PrefixBulkImportView(PermissionRequiredMixin, BulkImportView): @@ -459,7 +459,7 @@ class PrefixBulkImportView(PermissionRequiredMixin, BulkImportView): form = forms.PrefixImportForm table = tables.PrefixTable template_name = 'ipam/prefix_import.html' - obj_list_url = 'ipam:prefix_list' + default_return_url = 'ipam:prefix_list' class PrefixBulkEditView(PermissionRequiredMixin, BulkEditView): @@ -468,14 +468,14 @@ class PrefixBulkEditView(PermissionRequiredMixin, BulkEditView): filter = filters.PrefixFilter form = forms.PrefixBulkEditForm template_name = 'ipam/prefix_bulk_edit.html' - default_redirect_url = 'ipam:prefix_list' + default_return_url = 'ipam:prefix_list' class PrefixBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'ipam.delete_prefix' cls = Prefix filter = filters.PrefixFilter - default_redirect_url = 'ipam:prefix_list' + default_return_url = 'ipam:prefix_list' def prefix_ipaddresses(request, pk): @@ -569,7 +569,7 @@ def ipaddress_assign(request, pk): return render(request, 'ipam/ipaddress_assign.html', { 'ipaddress': ipaddress, 'form': form, - 'cancel_url': reverse('ipam:ipaddress', kwargs={'pk': ipaddress.pk}), + 'return_url': reverse('ipam:ipaddress', kwargs={'pk': ipaddress.pk}), }) @@ -602,7 +602,7 @@ def ipaddress_remove(request, pk): return render(request, 'ipam/ipaddress_unassign.html', { 'ipaddress': ipaddress, 'form': form, - 'cancel_url': reverse('ipam:ipaddress', kwargs={'pk': ipaddress.pk}), + 'return_url': reverse('ipam:ipaddress', kwargs={'pk': ipaddress.pk}), }) @@ -612,7 +612,7 @@ class IPAddressEditView(PermissionRequiredMixin, ObjectEditView): form_class = forms.IPAddressForm fields_initial = ['address', 'vrf'] template_name = 'ipam/ipaddress_edit.html' - obj_list_url = 'ipam:ipaddress_list' + default_return_url = 'ipam:ipaddress_list' class IPAddressDeleteView(PermissionRequiredMixin, ObjectDeleteView): @@ -626,7 +626,7 @@ class IPAddressBulkAddView(PermissionRequiredMixin, BulkAddView): form = forms.IPAddressBulkAddForm model = IPAddress template_name = 'ipam/ipaddress_bulk_add.html' - redirect_url = 'ipam:ipaddress_list' + default_return_url = 'ipam:ipaddress_list' class IPAddressBulkImportView(PermissionRequiredMixin, BulkImportView): @@ -634,7 +634,7 @@ class IPAddressBulkImportView(PermissionRequiredMixin, BulkImportView): form = forms.IPAddressImportForm table = tables.IPAddressTable template_name = 'ipam/ipaddress_import.html' - obj_list_url = 'ipam:ipaddress_list' + default_return_url = 'ipam:ipaddress_list' def save_obj(self, obj): obj.save() @@ -658,14 +658,14 @@ class IPAddressBulkEditView(PermissionRequiredMixin, BulkEditView): filter = filters.IPAddressFilter form = forms.IPAddressBulkEditForm template_name = 'ipam/ipaddress_bulk_edit.html' - default_redirect_url = 'ipam:ipaddress_list' + default_return_url = 'ipam:ipaddress_list' class IPAddressBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'ipam.delete_ipaddress' cls = IPAddress filter = filters.IPAddressFilter - default_redirect_url = 'ipam:ipaddress_list' + default_return_url = 'ipam:ipaddress_list' # @@ -694,7 +694,7 @@ class VLANGroupBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'ipam.delete_vlangroup' cls = VLANGroup filter = filters.VLANGroupFilter - default_redirect_url = 'ipam:vlangroup_list' + default_return_url = 'ipam:vlangroup_list' # @@ -727,7 +727,7 @@ class VLANEditView(PermissionRequiredMixin, ObjectEditView): model = VLAN form_class = forms.VLANForm template_name = 'ipam/vlan_edit.html' - obj_list_url = 'ipam:vlan_list' + default_return_url = 'ipam:vlan_list' class VLANDeleteView(PermissionRequiredMixin, ObjectDeleteView): @@ -741,7 +741,7 @@ class VLANBulkImportView(PermissionRequiredMixin, BulkImportView): form = forms.VLANImportForm table = tables.VLANTable template_name = 'ipam/vlan_import.html' - obj_list_url = 'ipam:vlan_list' + default_return_url = 'ipam:vlan_list' class VLANBulkEditView(PermissionRequiredMixin, BulkEditView): @@ -750,14 +750,14 @@ class VLANBulkEditView(PermissionRequiredMixin, BulkEditView): filter = filters.VLANFilter form = forms.VLANBulkEditForm template_name = 'ipam/vlan_bulk_edit.html' - default_redirect_url = 'ipam:vlan_list' + default_return_url = 'ipam:vlan_list' class VLANBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'ipam.delete_vlan' cls = VLAN filter = filters.VLANFilter - default_redirect_url = 'ipam:vlan_list' + default_return_url = 'ipam:vlan_list' # diff --git a/netbox/secrets/views.py b/netbox/secrets/views.py index 9f3bd6c41..da161ec1e 100644 --- a/netbox/secrets/views.py +++ b/netbox/secrets/views.py @@ -38,7 +38,7 @@ class SecretRoleEditView(PermissionRequiredMixin, ObjectEditView): class SecretRoleBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'secrets.delete_secretrole' cls = SecretRole - default_redirect_url = 'secrets:secretrole_list' + default_return_url = 'secrets:secretrole_list' # @@ -103,7 +103,7 @@ def secret_add(request, pk): return render(request, 'secrets/secret_edit.html', { 'secret': secret, 'form': form, - 'cancel_url': device.get_absolute_url(), + 'return_url': device.get_absolute_url(), }) @@ -145,7 +145,7 @@ def secret_edit(request, pk): return render(request, 'secrets/secret_edit.html', { 'secret': secret, 'form': form, - 'cancel_url': reverse('secrets:secret', kwargs={'pk': secret.pk}), + 'return_url': reverse('secrets:secret', kwargs={'pk': secret.pk}), }) @@ -195,7 +195,7 @@ def secret_import(request): return render(request, 'secrets/secret_import.html', { 'form': form, - 'cancel_url': reverse('secrets:secret_list'), + 'return_url': reverse('secrets:secret_list'), }) @@ -205,11 +205,11 @@ class SecretBulkEditView(PermissionRequiredMixin, BulkEditView): filter = filters.SecretFilter form = forms.SecretBulkEditForm template_name = 'secrets/secret_bulk_edit.html' - default_redirect_url = 'secrets:secret_list' + default_return_url = 'secrets:secret_list' class SecretBulkDeleteView(PermissionRequiredMixin, BulkDeleteView): permission_required = 'secrets.delete_secret' cls = Secret filter = filters.SecretFilter - default_redirect_url = 'secrets:secret_list' + default_return_url = 'secrets:secret_list' diff --git a/netbox/templates/circuits/circuit_import.html b/netbox/templates/circuits/circuit_import.html index fec7ff65e..e2fc9fa36 100644 --- a/netbox/templates/circuits/circuit_import.html +++ b/netbox/templates/circuits/circuit_import.html @@ -13,7 +13,7 @@ {% render_form form %}
- Cancel + Cancel
diff --git a/netbox/templates/circuits/circuittermination_edit.html b/netbox/templates/circuits/circuittermination_edit.html index 186b0e56c..8ccc05de2 100644 --- a/netbox/templates/circuits/circuittermination_edit.html +++ b/netbox/templates/circuits/circuittermination_edit.html @@ -83,7 +83,7 @@ {% else %} {% endif %} - Cancel + Cancel diff --git a/netbox/templates/circuits/provider_import.html b/netbox/templates/circuits/provider_import.html index d197c648f..a605164df 100644 --- a/netbox/templates/circuits/provider_import.html +++ b/netbox/templates/circuits/provider_import.html @@ -13,7 +13,7 @@ {% render_form form %}
- Cancel + Cancel
diff --git a/netbox/templates/dcim/consoleport_connect.html b/netbox/templates/dcim/consoleport_connect.html index 46d636d8c..c237bc2c9 100644 --- a/netbox/templates/dcim/consoleport_connect.html +++ b/netbox/templates/dcim/consoleport_connect.html @@ -40,7 +40,7 @@
- Cancel + Cancel
diff --git a/netbox/templates/dcim/consoleserverport_connect.html b/netbox/templates/dcim/consoleserverport_connect.html index 9d2bbf0c8..e747a9d57 100644 --- a/netbox/templates/dcim/consoleserverport_connect.html +++ b/netbox/templates/dcim/consoleserverport_connect.html @@ -40,7 +40,7 @@
- Cancel + Cancel
diff --git a/netbox/templates/dcim/device_bulk_add_component.html b/netbox/templates/dcim/device_bulk_add_component.html index 2854954cd..697942998 100644 --- a/netbox/templates/dcim/device_bulk_add_component.html +++ b/netbox/templates/dcim/device_bulk_add_component.html @@ -5,8 +5,8 @@

Add {{ component_name|title }}

{% csrf_token %} - {% if request.POST.redirect_url %} - + {% if request.POST.return_url %} + {% endif %} {% for field in form.hidden_fields %} {{ field }} @@ -51,7 +51,7 @@
- Cancel + Cancel
diff --git a/netbox/templates/dcim/device_component_add.html b/netbox/templates/dcim/device_component_add.html index 06b04a326..ab8f3bb21 100644 --- a/netbox/templates/dcim/device_component_add.html +++ b/netbox/templates/dcim/device_component_add.html @@ -34,7 +34,7 @@
- Cancel + Cancel
diff --git a/netbox/templates/dcim/device_import.html b/netbox/templates/dcim/device_import.html index c075abe34..c3915b9c3 100644 --- a/netbox/templates/dcim/device_import.html +++ b/netbox/templates/dcim/device_import.html @@ -13,7 +13,7 @@ {% render_form form %}
- Cancel + Cancel

CSV Format

diff --git a/netbox/templates/dcim/device_import_child.html b/netbox/templates/dcim/device_import_child.html index cf5d96e79..ca69d7aa5 100644 --- a/netbox/templates/dcim/device_import_child.html +++ b/netbox/templates/dcim/device_import_child.html @@ -13,7 +13,7 @@ {% render_form form %}
- Cancel + Cancel

CSV Format

diff --git a/netbox/templates/dcim/devicebay_populate.html b/netbox/templates/dcim/devicebay_populate.html index a9d84c5e7..94a4ef0d0 100644 --- a/netbox/templates/dcim/devicebay_populate.html +++ b/netbox/templates/dcim/devicebay_populate.html @@ -37,7 +37,7 @@
- Cancel + Cancel
diff --git a/netbox/templates/dcim/devicetype_component_add.html b/netbox/templates/dcim/devicetype_component_add.html index d64dd4775..9645b7813 100644 --- a/netbox/templates/dcim/devicetype_component_add.html +++ b/netbox/templates/dcim/devicetype_component_add.html @@ -33,7 +33,7 @@
- Cancel + Cancel
diff --git a/netbox/templates/dcim/inc/consoleport.html b/netbox/templates/dcim/inc/consoleport.html index ebe96a660..e6c816780 100644 --- a/netbox/templates/dcim/inc/consoleport.html +++ b/netbox/templates/dcim/inc/consoleport.html @@ -50,7 +50,7 @@ {% else %} - + {% endif %} diff --git a/netbox/templates/dcim/inc/consoleserverport.html b/netbox/templates/dcim/inc/consoleserverport.html index 848bb8f9d..d3c923e43 100644 --- a/netbox/templates/dcim/inc/consoleserverport.html +++ b/netbox/templates/dcim/inc/consoleserverport.html @@ -49,7 +49,7 @@ {% else %} - + {% endif %} diff --git a/netbox/templates/dcim/inc/devicebay.html b/netbox/templates/dcim/inc/devicebay.html index bc0934283..eacb27440 100644 --- a/netbox/templates/dcim/inc/devicebay.html +++ b/netbox/templates/dcim/inc/devicebay.html @@ -40,7 +40,7 @@ {% else %} - + {% endif %} diff --git a/netbox/templates/dcim/inc/interface.html b/netbox/templates/dcim/inc/interface.html index d249b8b6e..bfb44b75d 100644 --- a/netbox/templates/dcim/inc/interface.html +++ b/netbox/templates/dcim/inc/interface.html @@ -85,7 +85,7 @@ {% else %} - + {% endif %} diff --git a/netbox/templates/dcim/inc/poweroutlet.html b/netbox/templates/dcim/inc/poweroutlet.html index 929c9c903..241ebc15c 100644 --- a/netbox/templates/dcim/inc/poweroutlet.html +++ b/netbox/templates/dcim/inc/poweroutlet.html @@ -49,7 +49,7 @@ {% else %} - + {% endif %} diff --git a/netbox/templates/dcim/inc/powerport.html b/netbox/templates/dcim/inc/powerport.html index c06d38b5a..aacb96839 100644 --- a/netbox/templates/dcim/inc/powerport.html +++ b/netbox/templates/dcim/inc/powerport.html @@ -50,7 +50,7 @@ {% else %} - + {% endif %} diff --git a/netbox/templates/dcim/interfaceconnection_edit.html b/netbox/templates/dcim/interfaceconnection_edit.html index 5da19d4fa..ea30ad006 100644 --- a/netbox/templates/dcim/interfaceconnection_edit.html +++ b/netbox/templates/dcim/interfaceconnection_edit.html @@ -86,7 +86,7 @@
- Cancel + Cancel
diff --git a/netbox/templates/dcim/ipaddress_assign.html b/netbox/templates/dcim/ipaddress_assign.html index 533317baf..3312a39c3 100644 --- a/netbox/templates/dcim/ipaddress_assign.html +++ b/netbox/templates/dcim/ipaddress_assign.html @@ -53,7 +53,7 @@
- Cancel + Cancel
diff --git a/netbox/templates/dcim/poweroutlet_connect.html b/netbox/templates/dcim/poweroutlet_connect.html index 4e6356cb1..a302722df 100644 --- a/netbox/templates/dcim/poweroutlet_connect.html +++ b/netbox/templates/dcim/poweroutlet_connect.html @@ -40,7 +40,7 @@
- Cancel + Cancel
diff --git a/netbox/templates/dcim/powerport_connect.html b/netbox/templates/dcim/powerport_connect.html index 1365eafb0..94e567e68 100644 --- a/netbox/templates/dcim/powerport_connect.html +++ b/netbox/templates/dcim/powerport_connect.html @@ -40,7 +40,7 @@
- Cancel + Cancel
diff --git a/netbox/templates/dcim/rack_import.html b/netbox/templates/dcim/rack_import.html index 807bff8eb..c462a0be9 100644 --- a/netbox/templates/dcim/rack_import.html +++ b/netbox/templates/dcim/rack_import.html @@ -13,7 +13,7 @@ {% render_form form %}
- Cancel + Cancel
diff --git a/netbox/templates/dcim/site_import.html b/netbox/templates/dcim/site_import.html index 7f58e6396..3018cc2f1 100644 --- a/netbox/templates/dcim/site_import.html +++ b/netbox/templates/dcim/site_import.html @@ -13,7 +13,7 @@ {% render_form form %}
- Cancel + Cancel
diff --git a/netbox/templates/ipam/aggregate_import.html b/netbox/templates/ipam/aggregate_import.html index 51a0f95c2..8075b4874 100644 --- a/netbox/templates/ipam/aggregate_import.html +++ b/netbox/templates/ipam/aggregate_import.html @@ -13,7 +13,7 @@ {% render_form form %}
- Cancel + Cancel
diff --git a/netbox/templates/ipam/ipaddress_assign.html b/netbox/templates/ipam/ipaddress_assign.html index 10a582a2f..4b27eae0b 100644 --- a/netbox/templates/ipam/ipaddress_assign.html +++ b/netbox/templates/ipam/ipaddress_assign.html @@ -59,7 +59,7 @@
- Cancel + Cancel
diff --git a/netbox/templates/ipam/ipaddress_import.html b/netbox/templates/ipam/ipaddress_import.html index ad62b44df..3c01b4af0 100644 --- a/netbox/templates/ipam/ipaddress_import.html +++ b/netbox/templates/ipam/ipaddress_import.html @@ -13,7 +13,7 @@ {% render_form form %}
- Cancel + Cancel
diff --git a/netbox/templates/ipam/prefix_import.html b/netbox/templates/ipam/prefix_import.html index c42958cf4..0a9cc8694 100644 --- a/netbox/templates/ipam/prefix_import.html +++ b/netbox/templates/ipam/prefix_import.html @@ -13,7 +13,7 @@ {% render_form form %}
- Cancel + Cancel
diff --git a/netbox/templates/ipam/vlan_import.html b/netbox/templates/ipam/vlan_import.html index 2ba22feb7..16456ba01 100644 --- a/netbox/templates/ipam/vlan_import.html +++ b/netbox/templates/ipam/vlan_import.html @@ -13,7 +13,7 @@ {% render_form form %}
- Cancel + Cancel
diff --git a/netbox/templates/ipam/vrf_import.html b/netbox/templates/ipam/vrf_import.html index cbdee420d..9953542d2 100644 --- a/netbox/templates/ipam/vrf_import.html +++ b/netbox/templates/ipam/vrf_import.html @@ -13,7 +13,7 @@ {% render_form form %}
- Cancel + Cancel
diff --git a/netbox/templates/secrets/secret_edit.html b/netbox/templates/secrets/secret_edit.html index c2426391f..a83024fb4 100644 --- a/netbox/templates/secrets/secret_edit.html +++ b/netbox/templates/secrets/secret_edit.html @@ -59,7 +59,7 @@ {% else %} - Cancel + Cancel {% endif %} diff --git a/netbox/templates/secrets/secret_import.html b/netbox/templates/secrets/secret_import.html index 9c7f67640..0a9a11c69 100644 --- a/netbox/templates/secrets/secret_import.html +++ b/netbox/templates/secrets/secret_import.html @@ -22,7 +22,7 @@ {% render_form form %}
- Cancel + Cancel
diff --git a/netbox/templates/tenancy/tenant_import.html b/netbox/templates/tenancy/tenant_import.html index eb0c62c99..81f82989f 100644 --- a/netbox/templates/tenancy/tenant_import.html +++ b/netbox/templates/tenancy/tenant_import.html @@ -13,7 +13,7 @@ {% render_form form %}
- Cancel + Cancel
diff --git a/netbox/templates/utilities/bulk_edit_form.html b/netbox/templates/utilities/bulk_edit_form.html index 24a1b1077..3e3bbc187 100644 --- a/netbox/templates/utilities/bulk_edit_form.html +++ b/netbox/templates/utilities/bulk_edit_form.html @@ -5,8 +5,8 @@

{% block title %}{% endblock %}

{% csrf_token %} - {% if request.POST.redirect_url %} - + {% if request.POST.return_url %} + {% endif %} {% for field in form.hidden_fields %} {{ field }} @@ -44,7 +44,7 @@
- Cancel + Cancel
diff --git a/netbox/templates/utilities/confirmation_form.html b/netbox/templates/utilities/confirmation_form.html index 04e674e8a..8c97056da 100644 --- a/netbox/templates/utilities/confirmation_form.html +++ b/netbox/templates/utilities/confirmation_form.html @@ -23,7 +23,7 @@
- Cancel + Cancel
diff --git a/netbox/templates/utilities/obj_edit.html b/netbox/templates/utilities/obj_edit.html index ec0777c35..21ec67cef 100644 --- a/netbox/templates/utilities/obj_edit.html +++ b/netbox/templates/utilities/obj_edit.html @@ -37,7 +37,7 @@ {% endif %} - Cancel + Cancel
diff --git a/netbox/templates/utilities/obj_table.html b/netbox/templates/utilities/obj_table.html index 5ea4770e9..7144047fd 100644 --- a/netbox/templates/utilities/obj_table.html +++ b/netbox/templates/utilities/obj_table.html @@ -3,7 +3,7 @@ {% if table.model|user_can_change:request.user or table.model|user_can_delete:request.user %}
{% csrf_token %} - + {% if table.paginator.num_pages > 1 %}