From 7cb9cedfe1335b00307145312edf73852c8a6444 Mon Sep 17 00:00:00 2001
From: thatmattlove <mtt.lov@gmail.com>
Date: Fri, 3 Dec 2021 16:20:05 -0700
Subject: [PATCH] Fixes #7823: Properly handle return_url when Save & Continue
 button is present

---
 docs/release-notes/version-3.0.md             |   1 +
 netbox/project-static/dist/netbox.js          | Bin 322575 -> 322806 bytes
 netbox/project-static/dist/netbox.js.map      | Bin 310863 -> 311094 bytes
 netbox/project-static/src/forms/elements.ts   |  40 +++++++++++++++++-
 netbox/templates/dcim/interface_edit.html     |   2 +-
 .../virtualization/vminterface_edit.html      |   2 +-
 6 files changed, 42 insertions(+), 3 deletions(-)

diff --git a/docs/release-notes/version-3.0.md b/docs/release-notes/version-3.0.md
index b84f2a3c0..9be270999 100644
--- a/docs/release-notes/version-3.0.md
+++ b/docs/release-notes/version-3.0.md
@@ -5,6 +5,7 @@
 ### Enhancements
 
 * [#7751](https://github.com/netbox-community/netbox/issues/7751) - Get API user from LDAP only when `FIND_GROUP_PERMS` is enabled
+* [#7823](https://github.com/netbox-community/netbox/issues/7823) - Fix issue where `return_url` is not honored when 'Save & Continue' button is present
 * [#7885](https://github.com/netbox-community/netbox/issues/7885) - Linkify VLAN name in VLANs table
 * [#7892](https://github.com/netbox-community/netbox/issues/7892) - Add L22-30 power port & outlet types
 * [#7932](https://github.com/netbox-community/netbox/issues/7932) - Improve performance of the "quick find" function
diff --git a/netbox/project-static/dist/netbox.js b/netbox/project-static/dist/netbox.js
index b8567f0606eb5fb62dc8f125a33623f5466bf28c..c4a8e802d42c5888f200c459000fc7cbadd2e2b8 100644
GIT binary patch
delta 5490
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

delta 5384
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

diff --git a/netbox/project-static/dist/netbox.js.map b/netbox/project-static/dist/netbox.js.map
index c2e1c5b4f3d06367327002e48c1995cdd2b4b000..b95e6ba02e8321339453db43dad5d8056abef060 100644
GIT binary patch
delta 260
zcmX^AM`+tWp@tU57N#xCtB%&^C7L?vL^?X=I_tPPI#xRAI6FEUy6Ct&I{Jc$P>`sv
zj=!UGi4%zL3E~IpggQD#>I8$Nfyy(S;mU)7(#|0uH6WIwzfPi~W1>#7qqDgagbx<<
zc62Uq(s2Ztrt1k(>I*UxXnL@Yr=v5_JwT>6&`z)+&M6?B-a6rq-Vxi^9c3<K<n<2&
znQP(<cI)&x?JSaFU~@B_933;AbOIp;1zS2zS3AyJ&F$&vp5vzD?OfsJy?yy{<`v%n
D$lXi%

delta 52
zcmV-40L%Zj{u0mp5`csOgaWh!s>K9sVl_gyR>lK%0RmG<mq3dI6_*{z17-$GLuf=d
KMYoQ~1E}^a<`hx@

diff --git a/netbox/project-static/src/forms/elements.ts b/netbox/project-static/src/forms/elements.ts
index 978c25e10..5cb17f5c7 100644
--- a/netbox/project-static/src/forms/elements.ts
+++ b/netbox/project-static/src/forms/elements.ts
@@ -1,4 +1,32 @@
-import { getElements, scrollTo } from '../util';
+import { getElements, scrollTo, isTruthy } from '../util';
+
+/**
+ * When editing an object, it is sometimes desirable to customize the form action *without*
+ * overriding the form's `submit` event. For example, the 'Save & Continue' button. We don't want
+ * to use the `formaction` attribute on that element because it will be included on the form even
+ * if the button isn't clicked.
+ *
+ * @example
+ * ```html
+ * <button type="button" return-url="/special-url/">
+ *   Save & Continue
+ * </button>
+ * ```
+ *
+ * @param event Click event.
+ */
+function handleSubmitWithReturnUrl(event: MouseEvent): void {
+  const element = event.target as HTMLElement;
+  if (element.tagName === 'BUTTON') {
+    const button = element as HTMLButtonElement;
+    const action = button.getAttribute('return-url');
+    const form = button.form;
+    if (form !== null && isTruthy(action)) {
+      form.action = action;
+      form.submit();
+    }
+  }
+}
 
 function handleFormSubmit(event: Event, form: HTMLFormElement): void {
   // Track the names of each invalid field.
@@ -38,6 +66,15 @@ function handleFormSubmit(event: Event, form: HTMLFormElement): void {
   }
 }
 
+/**
+ * Attach event listeners to form buttons with the `return-url` attribute present.
+ */
+function initReturnUrlSubmitButtons(): void {
+  for (const button of getElements<HTMLButtonElement>('button[return-url]')) {
+    button.addEventListener('click', handleSubmitWithReturnUrl);
+  }
+}
+
 /**
  * Attach an event listener to each form's submitter (button[type=submit]). When called, the
  * callback checks the validity of each form field and adds the appropriate Bootstrap CSS class
@@ -54,4 +91,5 @@ export function initFormElements(): void {
       submitter.addEventListener('click', (event: Event) => handleFormSubmit(event, form));
     }
   }
+  initReturnUrlSubmitButtons();
 }
diff --git a/netbox/templates/dcim/interface_edit.html b/netbox/templates/dcim/interface_edit.html
index 38b22fe5e..317b49a79 100644
--- a/netbox/templates/dcim/interface_edit.html
+++ b/netbox/templates/dcim/interface_edit.html
@@ -51,7 +51,7 @@
 {% block buttons %}
     <a href="{{ return_url }}" class="btn btn-outline-danger">Cancel</a>
     {% if obj.pk %}
-        <button type="submit" formaction="?return_url={% url 'dcim:interface_edit' pk=obj.pk %}" class="btn btn-outline-primary">Save & Continue Editing</button>
+        <button type="button" return-url="?return_url={% url 'dcim:interface_edit' pk=obj.pk %}" class="btn btn-outline-primary">Save & Continue Editing</button>
         <button type="submit" name="_update" class="btn btn-primary">Save</button>
     {% else %}
         <button type="submit" name="_addanother" class="btn btn-outline-primary">Create & Add Another</button>
diff --git a/netbox/templates/virtualization/vminterface_edit.html b/netbox/templates/virtualization/vminterface_edit.html
index b4d097513..7e5b8599c 100644
--- a/netbox/templates/virtualization/vminterface_edit.html
+++ b/netbox/templates/virtualization/vminterface_edit.html
@@ -46,7 +46,7 @@
 {% block buttons %}
   <a href="{{ return_url }}" class="btn btn-outline-danger">Cancel</a>
   {% if obj.pk %}
-    <button type="submit" formaction="?return_url={% url 'virtualization:vminterface_edit' pk=obj.pk %}" class="btn btn-outline-primary">Save & Continue Editing</button>
+    <button type="button" return-url="?return_url={% url 'virtualization:vminterface_edit' pk=obj.pk %}" class="btn btn-outline-primary">Save & Continue Editing</button>
     <button type="submit" name="_update" class="btn btn-primary">Save</button>
   {% else %}
     <button type="submit" name="_addanother" class="btn btn-outline-primary">Create & Add Another</button>