From 2e75a111ed0e72e599c74bc057ee3c51a4bbcc5e Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Thu, 4 Nov 2021 14:09:12 -0400
Subject: [PATCH] Fix return URLs for contact assignment edit/delete

---
 netbox/templates/inc/panels/contacts.html | 6 +++---
 netbox/tenancy/views.py                   | 6 ------
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/netbox/templates/inc/panels/contacts.html b/netbox/templates/inc/panels/contacts.html
index 33788a561..872c11153 100644
--- a/netbox/templates/inc/panels/contacts.html
+++ b/netbox/templates/inc/panels/contacts.html
@@ -21,12 +21,12 @@
               <td>{{ contact.get_priority_display|placeholder }}</td>
               <td class="text-end noprint">
                 {% if perms.tenancy.change_contactassignment %}
-                  <a href="{% url 'tenancy:contactassignment_edit' pk=contact.pk %}" class="btn btn-warning btn-sm lh-1" title="Edit">
+                  <a href="{% url 'tenancy:contactassignment_edit' pk=contact.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-warning btn-sm lh-1" title="Edit">
                     <i class="mdi mdi-pencil" aria-hidden="true"></i>
                   </a>
                 {% endif %}
                 {% if perms.tenancy.delete_contactassignment %}
-                  <a href="{% url 'extras:imageattachment_delete' pk=contact.pk %}" class="btn btn-danger btn-sm lh-1" title="Delete">
+                  <a href="{% url 'tenancy:contactassignment_delete' pk=contact.pk %}?return_url={{ object.get_absolute_url }}" class="btn btn-danger btn-sm lh-1" title="Delete">
                     <i class="mdi mdi-trash-can-outline" aria-hidden="true"></i>
                   </a>
                 {% endif %}
@@ -41,7 +41,7 @@
   </div>
   {% if perms.tenancy.add_contactassignment %}
     <div class="card-footer text-end noprint">
-      <a href="{% url 'tenancy:contactassignment_add' %}?content_type={{ object|meta:"app_label" }}.{{ object|meta:"model_name" }}&object_id={{ object.pk }}" class="btn btn-primary btn-sm">
+      <a href="{% url 'tenancy:contactassignment_add' %}?content_type={{ object|meta:"app_label" }}.{{ object|meta:"model_name" }}&object_id={{ object.pk }}&return_url={{ object.get_absolute_url }}" class="btn btn-primary btn-sm">
         <i class="mdi mdi-plus-thick" aria-hidden="true"></i> Add a contact
       </a>
     </div>
diff --git a/netbox/tenancy/views.py b/netbox/tenancy/views.py
index dcef3d8be..5dadf86fb 100644
--- a/netbox/tenancy/views.py
+++ b/netbox/tenancy/views.py
@@ -351,12 +351,6 @@ class ContactAssignmentEditView(generic.ObjectEditView):
             instance.object = get_object_or_404(content_type.model_class(), pk=request.GET.get('object_id'))
         return instance
 
-    def get_return_url(self, request, obj=None):
-        return obj.object.get_absolute_url() if obj else super().get_return_url(request)
-
 
 class ContactAssignmentDeleteView(generic.ObjectDeleteView):
     queryset = ContactAssignment.objects.all()
-
-    def get_return_url(self, request, obj=None):
-        return obj.object.get_absolute_url() if obj else super().get_return_url(request)