Merge branch 'develop' into feature

2022-01-11 16:16:13 -05:00
parent 21e0e6e495 b584f09223
commit c8713d94d8
73 changed files with 582 additions and 245 deletions
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -2379,8 +2379,9 @@ class DeviceBayPopulateView(generic.ObjectEditView):
            device_bay.installed_device = form.cleaned_data['installed_device']
            device_bay.save()
            messages.success(request, "Added {} to {}.".format(device_bay.installed_device, device_bay))
+            return_url = self.get_return_url(request)

-            return redirect('dcim:device', pk=device_bay.device.pk)
+            return redirect(return_url)

        return render(request, 'dcim/devicebay_populate.html', {
            'device_bay': device_bay,