From fd93caedf8736604064977f9e63fa661803eca8a Mon Sep 17 00:00:00 2001 From: "Storm B. Heg" Date: Fri, 14 Jul 2023 15:10:30 +0200 Subject: [PATCH] Refactor all `field_as_li.html` includes `field_as_li.html` merely wraps a
  • and includes `field.html`. Remove `field_as_li.html` template It is no longer used. Historical mention in 1.0 release notes [^1] has been left intact. [^1]: docs/releases/1.0.rst Relates to #9031 --- CHANGELOG.txt | 1 + docs/releases/5.1.md | 19 ++++++++++ .../wagtailadmin/chooser/anchor_link.html | 4 ++- .../wagtailadmin/chooser/email_link.html | 4 ++- .../wagtailadmin/chooser/external_link.html | 4 ++- .../wagtailadmin/chooser/phone_link.html | 4 ++- .../wagtailadmin/generic/chooser/chooser.html | 4 ++- .../generic/chooser/creation_form.html | 4 ++- .../templates/wagtailadmin/generic/form.html | 4 ++- .../generic/multiple_upload/edit_form.html | 4 ++- .../templates/wagtailadmin/pages/copy.html | 24 +++++++++---- .../pages/move_choose_destination.html | 4 ++- .../wagtailadmin/shared/field_as_li.html | 1 - .../wagtailadmin/workflows/create_task.html | 4 ++- .../wagtailadmin/workflows/edit_task.html | 4 ++- .../workflows/task_chooser/chooser.html | 8 +++-- .../task_chooser/includes/create_form.html | 4 ++- .../wagtailforms/submissions_index.html | 4 ++- .../templates/wagtailredirects/add.html | 4 ++- .../wagtailredirects/choose_import_file.html | 4 ++- .../wagtailredirects/confirm_import.html | 4 ++- .../templates/wagtailredirects/edit.html | 4 ++- .../admin/submit_translation.html | 4 ++- .../templates/wagtailstyleguide/base.html | 4 ++- .../templates/wagtaildocs/documents/add.html | 4 ++- .../templates/wagtaildocs/documents/edit.html | 4 ++- .../wagtailembeds/chooser/chooser.html | 4 ++- .../wagtailimages/chooser/chooser.html | 4 ++- .../templates/wagtailimages/images/add.html | 4 ++- .../queries/chooser/chooser.html | 4 ++- .../tests/generic_view_templates/edit.html | 4 ++- .../templates/wagtailusers/groups/create.html | 4 ++- .../templates/wagtailusers/users/create.html | 32 ++++++++++++----- .../templates/wagtailusers/users/edit.html | 36 ++++++++++++++----- 34 files changed, 176 insertions(+), 53 deletions(-) delete mode 100644 wagtail/admin/templates/wagtailadmin/shared/field_as_li.html diff --git a/CHANGELOG.txt b/CHANGELOG.txt index f2ae12b09c14..bf4d9d1252ba 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -95,6 +95,7 @@ Changelog * Maintenance: Update uuid to v9 and Jest to v29, with `jest-environment-jsdom` and new snapshot format (LB (Ben) Johnston) * Maintenance: Update test cases producing undesirable console output due to missing mocks, uncaught errors, warnings (LB (Ben) Johnston) * Maintenance: Remove unused snippets _header_with_history.html template (Thibaud Colas) + * Maintenance: Remove `"wagtailadmin/shared/field_as_li.html"` template include (Storm Heg) 5.0.2 (21.06.2023) diff --git a/docs/releases/5.1.md b/docs/releases/5.1.md index 834fe309c697..17e12f37f55b 100644 --- a/docs/releases/5.1.md +++ b/docs/releases/5.1.md @@ -151,6 +151,7 @@ This feature was developed by Aman Pandey as part of the Google Summer of Code p * Remove unused snippets _header_with_history.html template (Thibaud Colas) * Migrate dialog instantiation to a new `w-dialog` Stimulus controller, including in the Userbar (Loveth Omokaro, LB (Ben) Johnston) * Support dialog template cloning using a new `w-teleport` Stimulus controller (Loveth Omokaro, LB (Ben) Johnston) + * Remove `"wagtailadmin/shared/field_as_li.html"` template include (Storm Heg) ## Upgrade considerations @@ -300,6 +301,24 @@ The undocumented shared include `wagtailadmin/shared/last_updated.html` is no lo {% human_readable_date my_model.timestamp %} ``` +### Shared include `field_as_li.html` is no longer available + +The documented include `"wagtailadmin/shared/field_as_li.html"` has been removed, if being used it will need to be replaced with `"wagtailadmin/shared/field.html"` wrapped within `li` tags. + +#### Before + +```html+django +{% include "wagtailadmin/shared/field_as_li.html" %} +``` + +#### After + +```html+django +
  • + {% include "wagtailadmin/shared/field.html" %} +
    • +``` + ### Tag (Tagit) field usage now relies on data attributes The `AdminTagWidget` widget has now been migrated to a Stimulus controller, if using this widget in Python, no changes are needed to adopt the new approach. diff --git a/wagtail/admin/templates/wagtailadmin/chooser/anchor_link.html b/wagtail/admin/templates/wagtailadmin/chooser/anchor_link.html index c3be2c7f3046..8140cb198d5a 100644 --- a/wagtail/admin/templates/wagtailadmin/chooser/anchor_link.html +++ b/wagtail/admin/templates/wagtailadmin/chooser/anchor_link.html @@ -9,7 +9,9 @@ {% csrf_token %} diff --git a/wagtail/admin/templates/wagtailadmin/chooser/email_link.html b/wagtail/admin/templates/wagtailadmin/chooser/email_link.html index 1938f3da9a7c..eaaedd7df136 100644 --- a/wagtail/admin/templates/wagtailadmin/chooser/email_link.html +++ b/wagtail/admin/templates/wagtailadmin/chooser/email_link.html @@ -9,7 +9,9 @@ {% csrf_token %} diff --git a/wagtail/admin/templates/wagtailadmin/chooser/external_link.html b/wagtail/admin/templates/wagtailadmin/chooser/external_link.html index a00e0d39b18e..5c57f467e8a5 100644 --- a/wagtail/admin/templates/wagtailadmin/chooser/external_link.html +++ b/wagtail/admin/templates/wagtailadmin/chooser/external_link.html @@ -9,7 +9,9 @@ {% csrf_token %} diff --git a/wagtail/admin/templates/wagtailadmin/chooser/phone_link.html b/wagtail/admin/templates/wagtailadmin/chooser/phone_link.html index 1db1e3cdd81b..9c8b56ca5743 100644 --- a/wagtail/admin/templates/wagtailadmin/chooser/phone_link.html +++ b/wagtail/admin/templates/wagtailadmin/chooser/phone_link.html @@ -9,7 +9,9 @@ {% csrf_token %} diff --git a/wagtail/admin/templates/wagtailadmin/generic/chooser/chooser.html b/wagtail/admin/templates/wagtailadmin/generic/chooser/chooser.html index 7b9b42dceb88..511c1085ee69 100644 --- a/wagtail/admin/templates/wagtailadmin/generic/chooser/chooser.html +++ b/wagtail/admin/templates/wagtailadmin/generic/chooser/chooser.html @@ -36,7 +36,9 @@ {% if filter_form.visible_fields %} {% endif %} diff --git a/wagtail/admin/templates/wagtailadmin/generic/chooser/creation_form.html b/wagtail/admin/templates/wagtailadmin/generic/chooser/creation_form.html index 2ac4e25fc62b..61137f1b6c83 100644 --- a/wagtail/admin/templates/wagtailadmin/generic/chooser/creation_form.html +++ b/wagtail/admin/templates/wagtailadmin/generic/chooser/creation_form.html @@ -13,7 +13,9 @@