diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 8af5116f5a..7a645a06b5 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -31,6 +31,7 @@ Changelog * Fix: Unclear error message when saving image after focal point edit (Hugo van den Berg) * Fix: `send_mail` now correctly uses the `html_message` kwarg for HTML messages (Tiago Requeijo) * Fix: Page copying no longer allowed if page model has reached its `max_count` (Andy Babic) + * Fix: Don't show page type on page chooser button when multiple types are allowed (Thijs Kramer) 2.4 (19.12.2018) diff --git a/docs/releases/2.5.rst b/docs/releases/2.5.rst index 9c14a5a61b..d4eede6504 100644 --- a/docs/releases/2.5.rst +++ b/docs/releases/2.5.rst @@ -47,6 +47,7 @@ Bug fixes * Increase max length on ``Embed.thumbnail_url`` to 255 characters (Kevin Howbrook) * ``send_mail`` now correctly uses the ``html_message`` kwarg for HTML messages (Tiago Requeijo) * Page copying no longer allowed if page model has reached its ``max_count`` (Andy Babic) + * Don't show page type on page chooser button when multiple types are allowed (Thijs Kramer) Upgrade considerations diff --git a/wagtail/admin/tests/test_widgets.py b/wagtail/admin/tests/test_widgets.py index 251b33bfc3..a0d14a7aca 100644 --- a/wagtail/admin/tests/test_widgets.py +++ b/wagtail/admin/tests/test_widgets.py @@ -76,7 +76,7 @@ class TestAdminPageChooserWidget(TestCase): ) html = widget.render_html('test', self.child_page, {}) - self.assertIn(">Choose a page (Simple Page, Event Page)<", html) + self.assertIn(">Choose a page<", html) def test_render_js_init_with_can_choose_root(self): widget = widgets.AdminPageChooser(can_choose_root=True) diff --git a/wagtail/admin/widgets.py b/wagtail/admin/widgets.py index 8224169e84..3b0b8acfae 100644 --- a/wagtail/admin/widgets.py +++ b/wagtail/admin/widgets.py @@ -171,9 +171,9 @@ class AdminPageChooser(AdminChooser): super().__init__(**kwargs) if target_models: - models = ', '.join([model._meta.verbose_name.title() for model in target_models if model is not Page]) - if models: - self.choose_one_text += ' (' + models + ')' + model_names = [model._meta.verbose_name.title() for model in target_models if model is not Page] + if len(model_names) == 1: + self.choose_one_text += ' (' + model_names[0] + ')' self.user_perms = user_perms self.target_models = list(target_models or [Page])