From 9152ba72f1ae2a4602a83558d1b8a77452f8cb59 Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Mon, 10 Jan 2022 14:44:25 -0500
Subject: [PATCH] Fixes #8306: Redirect user to previous page after login

---
 docs/release-notes/version-3.1.md        | 1 +
 netbox/templates/inc/profile_button.html | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/release-notes/version-3.1.md b/docs/release-notes/version-3.1.md
index c13a5df1f..0b3945119 100644
--- a/docs/release-notes/version-3.1.md
+++ b/docs/release-notes/version-3.1.md
@@ -14,6 +14,7 @@
 * [#8285](https://github.com/netbox-community/netbox/issues/8285) - Fix `cluster_count` under tenant REST API serializer
 * [#8287](https://github.com/netbox-community/netbox/issues/8287) - Correct label in export template form
 * [#8301](https://github.com/netbox-community/netbox/issues/8301) - Fix delete button for various object children views
+* [#8306](https://github.com/netbox-community/netbox/issues/8306) - Redirect user to previous page after login
 
 ---
 
diff --git a/netbox/templates/inc/profile_button.html b/netbox/templates/inc/profile_button.html
index 230aa02ad..1e562651f 100644
--- a/netbox/templates/inc/profile_button.html
+++ b/netbox/templates/inc/profile_button.html
@@ -38,7 +38,7 @@
   </div>
 {% else %}
   <div class="btn-group">
-    <a class="btn btn-primary ws-nowrap" type="button" href="{% url 'login' %}">
+    <a class="btn btn-primary ws-nowrap" type="button" href="{% url 'login' %}?next={{ request.path }}">
       <i class="mdi mdi-login-variant"></i> Log In
     </a>
     <button type="button" class="btn btn-primary dropdown-toggle dropdown-toggle-split" data-bs-toggle="dropdown">