From 83c4e7e2db1a76bc614df61ebcccc0125823ca8f Mon Sep 17 00:00:00 2001
From: Abhimanyu Saharan <desk.abhimanyu@gmail.com>
Date: Fri, 26 May 2023 19:30:51 +0530
Subject: [PATCH] simplified conditions

---
 netbox/netbox/tables/columns.py | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/netbox/netbox/tables/columns.py b/netbox/netbox/tables/columns.py
index ed8c37cc2..854228c54 100644
--- a/netbox/netbox/tables/columns.py
+++ b/netbox/netbox/tables/columns.py
@@ -235,11 +235,8 @@ class ActionsColumn(tables.Column):
 
         model = table.Meta.model
         request = getattr(table, 'context', {}).get('request')
-        query_params = request.GET.copy() if request else {}
-        if return_url := query_params.pop('return_url', None):
-            url_appendix = f'?return_url={quote(return_url[0])}'
-        else:
-            url_appendix = f'?return_url={quote(request.get_full_path())}' if request else ''
+        return_url = request.GET.get('return_url', request.get_full_path())
+        url_appendix = f'?return_url={quote(return_url)}' if return_url else ''
 
         html = ''