Use get_admin_display_title in PageChooserPanel

wagtail · Sep 28, 2020 · 61e8173 · 61e8173
1 parent 0c68159
commit 61e8173
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 3 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -26,6 +26,7 @@ Changelog
  * Fix: Revise `edit_handler` bind order in ModelAdmin views and fix duplicate form instance creation (Jérôme Lebleu)
  * Fix: Properly distinguish child blocks when comparing revisions with nested StreamBlocks (Martin Mena)
  * Fix: Correctly handle Turkish 'İ' characters in client-side slug generation (Matt Westcott)
+ * Fix: Page chooser widgets now reflect custom ``get_admin_display_title`` methods (Saptak Sengupta)
 
 
 2.10.2 (25.09.2020)

diff --git a/docs/releases/2.11.rst b/docs/releases/2.11.rst
@@ -40,6 +40,7 @@ Bug fixes
  * Revise ``edit_handler`` bind order in ModelAdmin views and fix duplicate form instance creation (Jérôme Lebleu)
  * Properly distinguish child blocks when comparing revisions with nested StreamBlocks (Martin Mena)
  * Correctly handle Turkish 'İ' characters in client-side slug generation (Matt Westcott)
+ * Page chooser widgets now reflect custom ``get_admin_display_title`` methods (Saptak Sengupta)
 
 
 Upgrade considerations

diff --git a/wagtail/admin/static_src/wagtailadmin/js/page-chooser.js b/wagtail/admin/static_src/wagtailadmin/js/page-chooser.js
@@ -26,7 +26,7 @@ function createPageChooser(id, pageTypes, openAtParentId, canChooseRoot, userPer
                 pageChosen: function(pageData) {
                     input.val(pageData.id);
                     openAtParentId = pageData.parentId;
-                    pageTitle.text(pageData.title);
+                    pageTitle.text(pageData.adminTitle);
                     chooserElement.removeClass('blank');
                     editLink.attr('href', pageData.editUrl);
                 }

diff --git a/wagtail/admin/templates/wagtailadmin/pages/listing/_page_title_choose.html b/wagtail/admin/templates/wagtailadmin/pages/listing/_page_title_choose.html
@@ -8,7 +8,7 @@
 
 <div class="title-wrapper">
     {% if page.can_choose %}
-        <a class="choose-page" href="#{{ page.id|unlocalize }}" data-id="{{ page.id|unlocalize }}" data-title="{{ page.title }}" data-url="{{ page.url }}" data-parent-id="{{ page.get_parent.id|unlocalize }}" data-edit-url="{% url 'wagtailadmin_pages:edit' page.id %}">{{ page.get_admin_display_title }}</a>
+        <a class="choose-page" href="#{{ page.id|unlocalize }}" data-id="{{ page.id|unlocalize }}" data-title="{{ page.title }}" data-admin-title="{{ page.get_admin_display_title }}" data-url="{{ page.url }}" data-parent-id="{{ page.get_parent.id|unlocalize }}" data-edit-url="{% url 'wagtailadmin_pages:edit' page.id %}">{{ page.get_admin_display_title }}</a>
     {% else %}
         {{ page.get_admin_display_title }}
     {% endif %}

diff --git a/wagtail/admin/templates/wagtailadmin/widgets/page_chooser.html b/wagtail/admin/templates/wagtailadmin/widgets/page_chooser.html
@@ -1,7 +1,7 @@
 {% extends "wagtailadmin/widgets/chooser.html" %}
 
 {% block chosen_state_view %}
-    <span class="title">{{ page.get_admin_display_title }}</span>
+    <span class="title">{{ page.specific.get_admin_display_title }}</span>
 {% endblock %}
 
 {% block edit_chosen_item_url %}{% if page %}{% url 'wagtailadmin_pages:edit' page.id %}{% endif %}{% endblock %}
diff --git a/wagtail/admin/tests/test_widgets.py b/wagtail/admin/tests/test_widgets.py
@@ -50,6 +50,8 @@ def test_render_html_with_value(self):
 
         html = widget.render_html('test', self.child_page, {})
         self.assertInHTML("""<input name="test" type="hidden" value="%d" />""" % self.child_page.id, html)
+        # SimplePage has a custom get_admin_display_title method which should be reflected here
+        self.assertInHTML("foobarbaz (simple page)", html)
 
     def test_render_js_init_with_value(self):
         widget = widgets.AdminPageChooser()