From 7e7b92aa648b1129023968b4dfd635a914c86ee9 Mon Sep 17 00:00:00 2001
From: Jaivignesh-afk <23f1001347@ds.study.iitm.ac.in>
Date: Mon, 12 Feb 2024 21:38:01 +0530
Subject: [PATCH 1/4] Added aria-hidden=true to empty <th> across admin

---
 .../__snapshots__/typed_table_block.test.js.snap            | 6 +++---
 .../contrib/typed_table_block/typed_table_block.js          | 2 +-
 .../includes/collection_member_permissions_formset.html     | 2 +-
 .../workflows/includes/workflow_pages_formset.html          | 2 +-
 wagtail/admin/ui/tables/pages.py                            | 2 +-
 .../wagtailusers/groups/includes/formatted_permissions.html | 2 +-
 .../groups/includes/page_permissions_formset.html           | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/client/src/entrypoints/contrib/typed_table_block/__snapshots__/typed_table_block.test.js.snap b/client/src/entrypoints/contrib/typed_table_block/__snapshots__/typed_table_block.test.js.snap
index aa39d95ee6..b223baba10 100644
--- a/client/src/entrypoints/contrib/typed_table_block/__snapshots__/typed_table_block.test.js.snap
+++ b/client/src/entrypoints/contrib/typed_table_block/__snapshots__/typed_table_block.test.js.snap
@@ -24,7 +24,7 @@ exports[`wagtail.contrib.typed_table_block.blocks.TypedTableBlock it renders cor
         <div class="typed-table-block__wrapper">
           <table>
             <thead>
-              <tr><th></th><th><input type="hidden" name="mytable-column-0-type" value="test_block_a"><input type="hidden" name="mytable-column-0-order" value="0"><button type="button" class="button button-secondary button-small button--icon text-replace prepend-column" aria-label="Insert column" title="Insert column">
+              <tr><th aria-hidden="true"></th><th><input type="hidden" name="mytable-column-0-type" value="test_block_a"><input type="hidden" name="mytable-column-0-order" value="0"><button type="button" class="button button-secondary button-small button--icon text-replace prepend-column" aria-label="Insert column" title="Insert column">
         <svg class="icon icon-plus icon" aria-hidden="true"><use href="#icon-plus"></use></svg>
       </button><input type="text" name="mytable-column-0-heading" class="column-heading" placeholder="Column heading"><button type="button" class="button button-secondary button-small button--icon text-replace no delete-column" aria-label="Delete column" title="Delete column">
         <svg class="icon icon-bin icon" aria-hidden="true"><use href="#icon-bin"></use></svg>
@@ -130,7 +130,7 @@ exports[`wagtail.contrib.typed_table_block.blocks.TypedTableBlock setError passe
         <div class="typed-table-block__wrapper">
           <table>
             <thead>
-              <tr><th></th><th><input type="hidden" name="mytable-column-0-type" value="test_block_a"><input type="hidden" name="mytable-column-0-order" value="0"><button type="button" class="button button-secondary button-small button--icon text-replace prepend-column" aria-label="Insert column" title="Insert column">
+              <tr><th aria-hidden="true"></th><th><input type="hidden" name="mytable-column-0-type" value="test_block_a"><input type="hidden" name="mytable-column-0-order" value="0"><button type="button" class="button button-secondary button-small button--icon text-replace prepend-column" aria-label="Insert column" title="Insert column">
         <svg class="icon icon-plus icon" aria-hidden="true"><use href="#icon-plus"></use></svg>
       </button><input type="text" name="mytable-column-0-heading" class="column-heading" placeholder="Column heading"><button type="button" class="button button-secondary button-small button--icon text-replace no delete-column" aria-label="Delete column" title="Delete column">
         <svg class="icon icon-bin icon" aria-hidden="true"><use href="#icon-bin"></use></svg>
@@ -236,7 +236,7 @@ exports[`wagtail.contrib.typed_table_block.blocks.TypedTableBlock setError shows
         <div class="typed-table-block__wrapper">
           <table>
             <thead>
-              <tr><th></th><th><input type="hidden" name="mytable-column-0-type" value="test_block_a"><input type="hidden" name="mytable-column-0-order" value="0"><button type="button" class="button button-secondary button-small button--icon text-replace prepend-column" aria-label="Insert column" title="Insert column">
+              <tr><th aria-hidden="true"></th><th><input type="hidden" name="mytable-column-0-type" value="test_block_a"><input type="hidden" name="mytable-column-0-order" value="0"><button type="button" class="button button-secondary button-small button--icon text-replace prepend-column" aria-label="Insert column" title="Insert column">
         <svg class="icon icon-plus icon" aria-hidden="true"><use href="#icon-plus"></use></svg>
       </button><input type="text" name="mytable-column-0-heading" class="column-heading" placeholder="Column heading"><button type="button" class="button button-secondary button-small button--icon text-replace no delete-column" aria-label="Delete column" title="Delete column">
         <svg class="icon icon-bin icon" aria-hidden="true"><use href="#icon-bin"></use></svg>
diff --git a/client/src/entrypoints/contrib/typed_table_block/typed_table_block.js b/client/src/entrypoints/contrib/typed_table_block/typed_table_block.js
index 16b4a8c894..d6e129545c 100644
--- a/client/src/entrypoints/contrib/typed_table_block/typed_table_block.js
+++ b/client/src/entrypoints/contrib/typed_table_block/typed_table_block.js
@@ -76,7 +76,7 @@ export class TypedTableBlock {
           <table>
             <thead>
               <tr>
-                <th></th>
+                <th aria-hidden="true"></th>
                 <th class="control-cell">
                   <button type="button" class="button button-small button-secondary append-column" data-append-column>
                     ${h(strings.ADD_COLUMN)}
diff --git a/wagtail/admin/templates/wagtailadmin/permissions/includes/collection_member_permissions_formset.html b/wagtail/admin/templates/wagtailadmin/permissions/includes/collection_member_permissions_formset.html
index 26364df596..2ea95a751b 100644
--- a/wagtail/admin/templates/wagtailadmin/permissions/includes/collection_member_permissions_formset.html
+++ b/wagtail/admin/templates/wagtailadmin/permissions/includes/collection_member_permissions_formset.html
@@ -26,7 +26,7 @@
                 {% for codename, short_label, long_label in formset.permission_types %}
                     <th title="{{ long_label }}">{{ short_label }}</th>
                 {% endfor %}
-                <th></th>
+                <th aria-hidden="true"></th>
             </tr>
         </thead>
         <tbody id="id_{{ formset.prefix }}-FORMS">
diff --git a/wagtail/admin/templates/wagtailadmin/workflows/includes/workflow_pages_formset.html b/wagtail/admin/templates/wagtailadmin/workflows/includes/workflow_pages_formset.html
index d8fbb55c96..10bead3c8d 100644
--- a/wagtail/admin/templates/wagtailadmin/workflows/includes/workflow_pages_formset.html
+++ b/wagtail/admin/templates/wagtailadmin/workflows/includes/workflow_pages_formset.html
@@ -17,7 +17,7 @@
     <thead>
         <tr>
             <th>{% trans "Page" %}</th>
-            <th></th>
+            <th aria-hidden="true"></th>
         </tr>
     </thead>
     <tbody id="id_{{ formset.prefix }}-FORMS">
diff --git a/wagtail/admin/ui/tables/pages.py b/wagtail/admin/ui/tables/pages.py
index c8693207f7..5403110cb8 100644
--- a/wagtail/admin/ui/tables/pages.py
+++ b/wagtail/admin/ui/tables/pages.py
@@ -81,7 +81,7 @@ class NavigateToChildrenColumn(BaseColumn):
         return context
 
     def render_header_html(self, parent_context):
-        return mark_safe("<th></th>")
+        return mark_safe("<th aria-hidden='true'></th>")
 
 
 class PageTable(Table):
diff --git a/wagtail/users/templates/wagtailusers/groups/includes/formatted_permissions.html b/wagtail/users/templates/wagtailusers/groups/includes/formatted_permissions.html
index 7d84cc8e96..de606b27f6 100644
--- a/wagtail/users/templates/wagtailusers/groups/includes/formatted_permissions.html
+++ b/wagtail/users/templates/wagtailusers/groups/includes/formatted_permissions.html
@@ -120,7 +120,7 @@
             <thead>
                 <tr>
                     <th>{% trans "Name" %}</th>
-                    <th></th>
+                    <th aria-hidden="true"></th>
                 </tr>
             </thead>
             <tbody>
diff --git a/wagtail/users/templates/wagtailusers/groups/includes/page_permissions_formset.html b/wagtail/users/templates/wagtailusers/groups/includes/page_permissions_formset.html
index 33a696f97b..eee73df606 100644
--- a/wagtail/users/templates/wagtailusers/groups/includes/page_permissions_formset.html
+++ b/wagtail/users/templates/wagtailusers/groups/includes/page_permissions_formset.html
@@ -25,7 +25,7 @@
                 {% for identifier, short_label, long_label in formset.permission_types %}
                     <th title="{{ long_label }}">{{ short_label }}</th>
                 {% endfor %}
-                <th></th>
+                <th aria-hidden="true"></th>
             </tr>
         </thead>
         <tbody id="id_{{ formset.prefix }}-FORMS">

From 9dbabcaa96c379fd0cb3f24eaac8f554cab6d0f2 Mon Sep 17 00:00:00 2001
From: Jaivignesh-afk <23f1001347@ds.study.iitm.ac.in>
Date: Mon, 12 Feb 2024 21:51:26 +0530
Subject: [PATCH 2/4] Added comments regarding the change

---
 .../includes/collection_member_permissions_formset.html         | 2 +-
 .../wagtailadmin/workflows/includes/workflow_pages_formset.html | 2 +-
 .../wagtailusers/groups/includes/formatted_permissions.html     | 2 +-
 .../wagtailusers/groups/includes/page_permissions_formset.html  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/wagtail/admin/templates/wagtailadmin/permissions/includes/collection_member_permissions_formset.html b/wagtail/admin/templates/wagtailadmin/permissions/includes/collection_member_permissions_formset.html
index 2ea95a751b..3f988187a5 100644
--- a/wagtail/admin/templates/wagtailadmin/permissions/includes/collection_member_permissions_formset.html
+++ b/wagtail/admin/templates/wagtailadmin/permissions/includes/collection_member_permissions_formset.html
@@ -26,7 +26,7 @@
                 {% for codename, short_label, long_label in formset.permission_types %}
                     <th title="{{ long_label }}">{{ short_label }}</th>
                 {% endfor %}
-                <th aria-hidden="true"></th>
+                <th aria-hidden="true">{% comment "" %} added for visual alignment only {% endcomment %}</th>
             </tr>
         </thead>
         <tbody id="id_{{ formset.prefix }}-FORMS">
diff --git a/wagtail/admin/templates/wagtailadmin/workflows/includes/workflow_pages_formset.html b/wagtail/admin/templates/wagtailadmin/workflows/includes/workflow_pages_formset.html
index 10bead3c8d..cc22dcdcf3 100644
--- a/wagtail/admin/templates/wagtailadmin/workflows/includes/workflow_pages_formset.html
+++ b/wagtail/admin/templates/wagtailadmin/workflows/includes/workflow_pages_formset.html
@@ -17,7 +17,7 @@
     <thead>
         <tr>
             <th>{% trans "Page" %}</th>
-            <th aria-hidden="true"></th>
+            <th aria-hidden="true">{% comment "" %} added for visual alignment only {% endcomment %}</th>
         </tr>
     </thead>
     <tbody id="id_{{ formset.prefix }}-FORMS">
diff --git a/wagtail/users/templates/wagtailusers/groups/includes/formatted_permissions.html b/wagtail/users/templates/wagtailusers/groups/includes/formatted_permissions.html
index de606b27f6..51cfabe391 100644
--- a/wagtail/users/templates/wagtailusers/groups/includes/formatted_permissions.html
+++ b/wagtail/users/templates/wagtailusers/groups/includes/formatted_permissions.html
@@ -120,7 +120,7 @@
             <thead>
                 <tr>
                     <th>{% trans "Name" %}</th>
-                    <th aria-hidden="true"></th>
+                    <th aria-hidden="true">{% comment %} added for visual alignment only {% endcomment %}</th>
                 </tr>
             </thead>
             <tbody>
diff --git a/wagtail/users/templates/wagtailusers/groups/includes/page_permissions_formset.html b/wagtail/users/templates/wagtailusers/groups/includes/page_permissions_formset.html
index eee73df606..d875716c92 100644
--- a/wagtail/users/templates/wagtailusers/groups/includes/page_permissions_formset.html
+++ b/wagtail/users/templates/wagtailusers/groups/includes/page_permissions_formset.html
@@ -25,7 +25,7 @@
                 {% for identifier, short_label, long_label in formset.permission_types %}
                     <th title="{{ long_label }}">{{ short_label }}</th>
                 {% endfor %}
-                <th aria-hidden="true"></th>
+                <th aria-hidden="true">{% comment %} added for visual alignment only {% endcomment %}</th>
             </tr>
         </thead>
         <tbody id="id_{{ formset.prefix }}-FORMS">

From d6c585a46c8efd9d43ec5cebe6298d0ce8dc0c29 Mon Sep 17 00:00:00 2001
From: Jaivignesh-afk <23f1001347@ds.study.iitm.ac.in>
Date: Tue, 13 Feb 2024 21:36:48 +0530
Subject: [PATCH 3/4] Added false in save function to skip model validation
 during page unlocking

---
 wagtail/admin/views/generic/lock.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wagtail/admin/views/generic/lock.py b/wagtail/admin/views/generic/lock.py
index 470809cdf4..4bcf17bed1 100644
--- a/wagtail/admin/views/generic/lock.py
+++ b/wagtail/admin/views/generic/lock.py
@@ -29,7 +29,7 @@ class UnlockView(BaseOperationView):
         self.object.locked = False
         self.object.locked_by = None
         self.object.locked_at = None
-        self.object.save(update_fields=["locked", "locked_by", "locked_at"])
+        self.object.save(False, update_fields=["locked", "locked_by", "locked_at"])
         log(instance=self.object, action="wagtail.unlock", user=self.request.user)
 
     def get_success_message(self):

From d141c63ab5150c7e7be8e9a8ae32a81768dbbe8a Mon Sep 17 00:00:00 2001
From: Jaivignesh-afk <23f1001347@ds.study.iitm.ac.in>
Date: Mon, 19 Feb 2024 18:58:03 +0530
Subject: [PATCH 4/4] Added test for the testing unlocking page with validation
 errors

---
 .../admin/tests/pages/test_page_locking.py    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/wagtail/admin/tests/pages/test_page_locking.py b/wagtail/admin/tests/pages/test_page_locking.py
index 3a22624e78..6093b226f3 100644
--- a/wagtail/admin/tests/pages/test_page_locking.py
+++ b/wagtail/admin/tests/pages/test_page_locking.py
@@ -343,3 +343,22 @@ class TestLocking(WagtailTestUtils, TestCase):
         self.assertFalse(page.locked)
         self.assertIsNone(page.locked_by)
         self.assertIsNone(page.locked_at)
+
+    def test_unlock_page_skip_validation_errors(self):
+        # Lock the page
+        self.child_page.locked = True
+        self.child_page.locked_by = self.user
+        self.child_page.locked_at = timezone.now()
+        self.child_page.title = 100
+        # Does not raise ValidationError
+        response = self.client.post(
+            reverse("wagtailadmin_pages:unlock", args=(self.child_page.id,))
+        )
+        self.assertRedirects(
+            response,
+            reverse("wagtailadmin_explore", args=(self.root_page.id,)),
+        )
+        page = Page.objects.get(id=self.child_page.id)
+        self.assertFalse(page.locked)
+        self.assertIsNone(page.locked_by)
+        self.assertIsNone(page.locked_at)