From 8c8774cd2fd5e826c6787b415af2136429b4eecb Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Tue, 4 Jan 2022 13:24:15 -0500
Subject: [PATCH] Fixes #8226: Honor return URL after populating a device bay

---
 docs/release-notes/version-3.1.md             | 1 +
 netbox/dcim/views.py                          | 3 ++-
 netbox/templates/dcim/devicebay_populate.html | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/release-notes/version-3.1.md b/docs/release-notes/version-3.1.md
index b523ab8c7..963aaad23 100644
--- a/docs/release-notes/version-3.1.md
+++ b/docs/release-notes/version-3.1.md
@@ -5,6 +5,7 @@
 ### Bug Fixes
 
 * [#8213](https://github.com/netbox-community/netbox/issues/8213) - Fix ValueError exception under prefix IP addresses view
+* [#8226](https://github.com/netbox-community/netbox/issues/8226) - Honor return URL after populating a device bay
 
 ---
 
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 7048ae63e..cee516f5c 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -2035,8 +2035,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,
diff --git a/netbox/templates/dcim/devicebay_populate.html b/netbox/templates/dcim/devicebay_populate.html
index d0f47921a..237227277 100644
--- a/netbox/templates/dcim/devicebay_populate.html
+++ b/netbox/templates/dcim/devicebay_populate.html
@@ -4,7 +4,7 @@
 {% render_errors form %}
 
 {% block content %}
-<form action="." method="post">
+<form action="" method="post">
     {% csrf_token %}
     <div class="row mb-3">
         <div class="col col-md-6 offset-md-3">