fix search page not redirecting correctly after track form submit

Author: FuzzyGrim

src/app/views.py

@@ -281,7 +281,7 @@ def track_form(request: HttpRequest) -> HttpResponse:
             "form_id": form_id,
             "form": form,
             "allow_delete": allow_delete,
-            "return_url": request.GET.get("return_url", reverse("home")),
+            "return_url": request.GET["return_url"],
         },
     )
 

src/templates/app/components/fill_track_form.html

@@ -1,26 +1,25 @@
 {% load crispy_forms_tags %}
-
 <div class="modal-dialog modal-dialog-centered modal-dialog-scrollable">
   <div class="modal-content text-start">
-
     <div class="modal-header">
-      <div class="modal-title fs-5">
-        {{ title }}
-      </div>
-      <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      <div class="modal-title fs-5">{{ title }}</div>
+      <button type="button"
+              class="btn-close"
+              data-bs-dismiss="modal"
+              aria-label="Close"></button>
     </div>
-
-    <div class="modal-body">
-      {% crispy form %}
-    </div>
-
+    <div class="modal-body">{% crispy form %}</div>
     <div class="modal-footer d-flex flex-row-reverse justify-content-between">
-      <button type="submit" form="{{ form_id }}" formaction="{% url 'media_save' %}?next={{ return_url }}" class="btn btn-primary">Save</button>
-
+      <button type="submit"
+              form="{{ form_id }}"
+              formaction="{% url 'media_save' %}?next={{ return_url }}"
+              class="btn btn-primary">Save</button>
       {% if allow_delete %}
-        <button type="submit" form="{{ form_id }}" formaction="{% url 'media_delete' %}?next={{ return_url }}" class="btn btn-danger">Delete</button>
+        <button type="submit"
+                form="{{ form_id }}"
+                formaction="{% url 'media_delete' %}?next={{ return_url }}"
+                class="btn btn-danger">Delete</button>
       {% endif %}
     </div>
-
   </div>
-</div>
+</div>

src/templates/app/components/open_track_form.html

@@ -1,8 +1,7 @@
 {% load app_extras %}
-
 <button type="button"
         hx-get="/track_form"
-        hx-vals='{"return_url": "{{ request.path }}", "title": "{{ title|addslashes_double }}", "media_type": "{{ media_type }}", "media_id": "{{ media_id }}"{% if season_number %}, "season_number": "{{ season_number }}"{% endif %}}'
+        hx-vals='{"return_url": "{{ request.get_full_path|urlencode }}", "title": "{{ title|addslashes_double }}", "media_type": "{{ media_type }}", "media_id": "{{ media_id }}"{% if season_number %}, "season_number": "{{ season_number }}"{% endif %}}'
         hx-target="#track-modal-{{ media_type }}_{{ media_id }}{% if season_number %}_{{ season_number }}{% endif %}"
         hx-trigger="click once"
         title="Track"
@@ -11,7 +10,6 @@
         data-bs-target="#track-modal-{{ media_type }}_{{ media_id }}{% if season_number %}_{{ season_number }}{% endif %}">
   <i class="bi bi-pencil-square"></i>
 </button>
-
 <div class="modal fade track-modal"
      id="track-modal-{{ media_type }}_{{ media_id }}{% if season_number %}_{{ season_number }}{% endif %}"
      tabindex="-1"