From 72e8fdd603d40c36bab240c3bcc8e43a3d79c6f2 Mon Sep 17 00:00:00 2001
From: davitacols <davitacols@gmail.com>
Date: Tue, 24 Mar 2026 14:30:10 +0100
Subject: [PATCH 1/3] Fixed #36976 -- Made admin action counter a live region
 for screen readers.

---
 django/contrib/admin/templates/admin/actions.html |  2 +-
 tests/admin_views/tests.py                        | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/django/contrib/admin/templates/admin/actions.html b/django/contrib/admin/templates/admin/actions.html
index db7345dc6020..ff2a5fe3d7ba 100644
--- a/django/contrib/admin/templates/admin/actions.html
+++ b/django/contrib/admin/templates/admin/actions.html
@@ -9,7 +9,7 @@
     {% endblock %}
     {% block actions-counter %}
     {% if actions_selection_counter %}
-        <span class="action-counter" data-actions-icnt="{{ cl.result_list|length }}">{{ selection_note }}</span>
+        <span class="action-counter" data-actions-icnt="{{ cl.result_list|length }}" aria-live="polite" aria-atomic="true">{{ selection_note }}</span>
         {% if cl.result_count != cl.result_list|length %}
         <span class="all hidden">{{ selection_note_all }}</span>
         <span class="question hidden">
diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py
index ac4265c4b483..e01ab3b538aa 100644
--- a/tests/admin_views/tests.py
+++ b/tests/admin_views/tests.py
@@ -4646,6 +4646,16 @@ def test_changelist_input_html(self):
         # 1 select per object = 3 selects
         self.assertContains(response, "<select", count=4)
 
+    def test_actions_counter_is_live_region(self):
+        response = self.client.get(reverse("admin:admin_views_person_changelist"))
+        self.assertContains(
+            response,
+            (
+                'class="action-counter" data-actions-icnt="3" '
+                'aria-live="polite" aria-atomic="true"'
+            ),
+        )
+
     def test_post_messages(self):
         # Ticket 12707: Saving inline editable should not show admin
         # action warnings

From 10ea59be19e5c88631511b9c11e74852e7b8d530 Mon Sep 17 00:00:00 2001
From: Jacob Walls <jacobtylerwalls@gmail.com>
Date: Tue, 24 Mar 2026 16:55:48 -0400
Subject: [PATCH 2/3] Refs #36485 -- Ignored removal of double spaces in git
 blame.

---
 .git-blame-ignore-revs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index cf37a382f81b..05d11bcbb7f8 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -16,3 +16,4 @@ b1e33ceceda1e75ff68c7deed8f6659683a195d3
 c9178ef17a0e1070f5a25096d8e13385d404dc92
 1101467ce0756272a54f4c7bc65c4c335a94111b
 6cff02078799b7c683a0d39630d49ab4fe532e7c
+4286a23df64f6ce3b9b6ed097f4d1aac7d9e0de4

From 386257b33eb2a925cecc1a12ba5e7dd694617186 Mon Sep 17 00:00:00 2001
From: Vignesh Anand <vigneshanandmay13@gmail.com>
Date: Wed, 25 Mar 2026 03:24:02 +0530
Subject: [PATCH 3/3] Refs #36494 -- Prevented crash in JSONField numeric
 lookups with expressions.

---
 django/db/models/fields/json.py      |  4 ++--
 tests/model_fields/test_jsonfield.py | 29 ++++++++++++++++++++++++++++
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/django/db/models/fields/json.py b/django/db/models/fields/json.py
index ed7b4d26a6a6..6478c57aaed8 100644
--- a/django/db/models/fields/json.py
+++ b/django/db/models/fields/json.py
@@ -698,8 +698,8 @@ class KeyTransformIRegex(
 class KeyTransformNumericLookupMixin:
     def process_rhs(self, compiler, connection):
         rhs, rhs_params = super().process_rhs(compiler, connection)
-        if not connection.features.has_native_json_field:
-            rhs_params = [json.loads(value) for value in rhs_params]
+        if not connection.features.has_native_json_field and self.rhs_is_direct_value():
+            rhs_params = tuple(json.loads(value) for value in rhs_params)
         return rhs, rhs_params
 
 
diff --git a/tests/model_fields/test_jsonfield.py b/tests/model_fields/test_jsonfield.py
index 7b07a48a1ece..6171fa7c6d4c 100644
--- a/tests/model_fields/test_jsonfield.py
+++ b/tests/model_fields/test_jsonfield.py
@@ -1304,6 +1304,35 @@ def test_json_type_casting_with_coalesce(self):
         ).first()
         self.assertEqual(result.coalesced_value, "This is valid JSON primitive.")
 
+    def test_numeric_lookups_with_expression(self):
+        obj_greater = NullableJSONModel.objects.create(
+            value={"target": 5, "comparison": 2}
+        )
+        obj_lesser = NullableJSONModel.objects.create(
+            value={"target": 2, "comparison": 5}
+        )
+        obj_equal = NullableJSONModel.objects.create(
+            value={"target": 2, "comparison": 2}
+        )
+        objs = [obj_greater.pk, obj_lesser.pk, obj_equal.pk]
+
+        tests = [
+            ("gt", [obj_greater]),
+            ("lt", [obj_lesser]),
+            ("gte", [obj_greater, obj_equal]),
+            ("lte", [obj_lesser, obj_equal]),
+        ]
+
+        for lookup, expected in tests:
+            with self.subTest(lookup=lookup):
+                self.assertCountEqual(
+                    NullableJSONModel.objects.filter(
+                        id__in=objs,
+                        **{f"value__target__{lookup}": F("value__comparison")},
+                    ),
+                    expected,
+                )
+
 
 @skipUnlessDBFeature("supports_primitives_in_json_field")
 class JSONNullTests(TestCase):