diff --git a/CHANGELOG.txt b/CHANGELOG.txt index e6c30e80d8..b910f2701f 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -11,6 +11,7 @@ Changelog * Fix: Delete button is now correct colour on snippets and modeladmin listings (Brandon Murch) * Fix: Ensure that StreamBlock / ListBlock-level validation errors are counted towards error counts (Matt Westcott) * Fix: InlinePanel add button is now keyboard navigatable (Jesse Menn) + * Fix: Remove redundant 'clear' button from site root page chooser (Matt Westcott) 2.14 (02.08.2021) diff --git a/docs/releases/2.15.rst b/docs/releases/2.15.rst index ee9cad6746..9116efbef7 100644 --- a/docs/releases/2.15.rst +++ b/docs/releases/2.15.rst @@ -26,6 +26,7 @@ Bug fixes * Delete button is now correct colour on snippets and modeladmin listings (Brandon Murch) * Ensure that StreamBlock / ListBlock-level validation errors are counted towards error counts (Matt Westcott) * InlinePanel add button is now keyboard navigatable (Jesse Menn) + * Remove redundant 'clear' button from site root page chooser (Matt Westcott) Upgrade considerations ====================== diff --git a/wagtail/sites/forms.py b/wagtail/sites/forms.py index a1dce8f0b2..ecf09939f6 100644 --- a/wagtail/sites/forms.py +++ b/wagtail/sites/forms.py @@ -9,7 +9,8 @@ class SiteForm(forms.ModelForm): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) self.fields['root_page'].widget = AdminPageChooser( - choose_one_text=_('Choose a root page'), choose_another_text=_('Choose a different root page') + choose_one_text=_('Choose a root page'), choose_another_text=_('Choose a different root page'), + show_clear_link=False ) required_css_class = "required" diff --git a/wagtail/sites/templates/wagtailsites/create.html b/wagtail/sites/templates/wagtailsites/create.html index dbef22db92..22a663427f 100644 --- a/wagtail/sites/templates/wagtailsites/create.html +++ b/wagtail/sites/templates/wagtailsites/create.html @@ -1,6 +1,7 @@ {% extends "wagtailadmin/generic/create.html" %} +{% load wagtailadmin_tags %} {% block extra_js %} {{ block.super }} - {% include "wagtailadmin/pages/_editor_js.html" %} + {% endblock %} diff --git a/wagtail/sites/templates/wagtailsites/edit.html b/wagtail/sites/templates/wagtailsites/edit.html index 1164d8b67f..1111486e71 100644 --- a/wagtail/sites/templates/wagtailsites/edit.html +++ b/wagtail/sites/templates/wagtailsites/edit.html @@ -1,6 +1,7 @@ {% extends "wagtailadmin/generic/edit.html" %} +{% load wagtailadmin_tags %} {% block extra_js %} {{ block.super }} - {% include "wagtailadmin/pages/_editor_js.html" %} + {% endblock %}