From 8cdeb23a439627ea8d05a2061bb7887e3461e49b Mon Sep 17 00:00:00 2001
From: Matt Westcott <matt@west.co.tt>
Date: Sat, 30 Nov 2024 04:13:01 +0000
Subject: [PATCH] Preserve URL parameters on parent link in page chooser search
 results

Fixes #11955
---
 .../chooser/tables/parent_page_cell.html             |  2 +-
 wagtail/admin/tests/test_page_chooser.py             | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/wagtail/admin/templates/wagtailadmin/chooser/tables/parent_page_cell.html b/wagtail/admin/templates/wagtailadmin/chooser/tables/parent_page_cell.html
index c8aa24d937..ad754ae243 100644
--- a/wagtail/admin/templates/wagtailadmin/chooser/tables/parent_page_cell.html
+++ b/wagtail/admin/templates/wagtailadmin/chooser/tables/parent_page_cell.html
@@ -1,7 +1,7 @@
 {% load wagtailadmin_tags %}
 <td {% if column.classname %}class="{{ column.classname }}"{% endif %}>
     {% if value %}
-        <a href="{% url 'wagtailadmin_choose_page_child' value.id %}" class="navigate-parent">{{ value.get_admin_display_title }}</a>
+        <a href="{% url 'wagtailadmin_choose_page_child' value.id %}{% querystring p=None q=None %}" class="navigate-parent">{{ value.get_admin_display_title }}</a>
         {% if show_locale_labels %}{% status value.locale.get_display_name classname="w-status--label" %}{% endif %}
     {% endif %}
 </td>
diff --git a/wagtail/admin/tests/test_page_chooser.py b/wagtail/admin/tests/test_page_chooser.py
index 1114226865..5ec5cfbdba 100644
--- a/wagtail/admin/tests/test_page_chooser.py
+++ b/wagtail/admin/tests/test_page_chooser.py
@@ -371,12 +371,22 @@ class TestChooserSearch(WagtailTestUtils, TransactionTestCase):
         return self.client.get(reverse("wagtailadmin_choose_page_search"), params or {})
 
     def test_simple(self):
-        response = self.get({"q": "foobarbaz"})
+        response = self.get({"q": "foobarbaz", "allow_external_link": "true"})
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, "wagtailadmin/chooser/_search_results.html")
         self.assertContains(response, "There is 1 match")
         self.assertContains(response, "foobarbaz")
 
+        # parent page link should preserve the allow_external_link parameter
+        expected_url = (
+            reverse("wagtailadmin_choose_page_child", args=[self.root_page.id])
+            + "?allow_external_link=true"
+        )
+        self.assertContains(
+            response,
+            f'<a href="{expected_url}" class="navigate-parent">{self.root_page.title}</a>',
+        )
+
     def test_partial_match(self):
         response = self.get({"q": "fooba"})
         self.assertEqual(response.status_code, 200)