diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 6cca39864c..448f6387fa 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -24,6 +24,7 @@ Changelog * Fix: Ensure Cloudfront cache invalidation is called with a list, for compatibility with current botocore versions (Jake Howard) * Fix: Show the correct privacy status in the sidebar when creating a new page (Joel William) * Fix: Prevent generic model edit view from unquoting non-integer primary keys multiple times (Matt Westcott) + * Fix: Ensure comments are functional when editing Page models with `read_only` `Fieldpanel`s in use (Strapchay) * Docs: Move the model reference page from reference/pages to the references section as it covers all Wagtail core models (Srishti Jaiswal) * Docs: Move the panels reference page from references/pages to the references section as panels are available for any model editing, merge panels API into this page (Srishti Jaiswal) * Docs: Move the tags documentation to standalone advanced topic, instead of being inside the reference/pages section (Srishti Jaiswal) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 84a281dde6..432155e358 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -856,6 +856,7 @@ * Steven Steinwand * Clifford Gama * Noah van der Meer +* Strapchay ## Translators diff --git a/client/src/entrypoints/admin/comments.js b/client/src/entrypoints/admin/comments.js index e7da4a82f5..2e8a13c9a1 100644 --- a/client/src/entrypoints/admin/comments.js +++ b/client/src/entrypoints/admin/comments.js @@ -19,7 +19,7 @@ window.comments = (() => { function getContentPath(fieldNode) { // Return the total contentpath for an element as a string, in the form field.streamfield_uid.block... - if (fieldNode.closest('[data-contentpath-disabled]')) { + if (!fieldNode || fieldNode.closest('[data-contentpath-disabled]')) { return ''; } let element = fieldNode.closest('[data-contentpath]'); diff --git a/docs/releases/6.4.md b/docs/releases/6.4.md index 26159dfb2d..2fff7c4bae 100644 --- a/docs/releases/6.4.md +++ b/docs/releases/6.4.md @@ -37,6 +37,7 @@ depth: 1 * Ensure Cloudfront cache invalidation is called with a list, for compatibility with current botocore versions (Jake Howard) * Show the correct privacy status in the sidebar when creating a new page (Joel William) * Prevent generic model edit view from unquoting non-integer primary keys multiple times (Matt Westcott) + * Ensure comments are functional when editing Page models with `read_only` `Fieldpanel`s in use (Strapchay) ### Documentation