From c83c639ba0c67dbb0f627be3df29d1224ea92d2b Mon Sep 17 00:00:00 2001
From: Eliana Rosselli <elianarosselli@Octobots-MacBook-Pro.local>
Date: Fri, 20 Oct 2023 09:42:30 -0400
Subject: [PATCH] Fixed #34909 -- Associated links in admin navigation sidebar
 with row descriptions.

This adds aria-describedby attribute to the models' links in the admin
navigation sidebar.

Thanks Thibaud Colas for the review.

Co-authored-by: Dara Silvera <dsilvera@octobot.io>
---
 .../admin/templates/admin/app_list.html       |  8 +++----
 tests/admin_views/test_nav_sidebar.py         |  3 ++-
 tests/admin_views/tests.py                    | 23 +++++++++++++++++++
 3 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/django/contrib/admin/templates/admin/app_list.html b/django/contrib/admin/templates/admin/app_list.html
index 941680d89b..3b67b5feab 100644
--- a/django/contrib/admin/templates/admin/app_list.html
+++ b/django/contrib/admin/templates/admin/app_list.html
@@ -10,7 +10,7 @@
         {% for model in app.models %}
           {% with model_name=model.object_name|lower %}
             <tr class="model-{{ model_name }}{% if model.admin_url in request.path|urlencode %} current-model{% endif %}">
-              <th scope="row">
+              <th scope="row" id="{{ app.app_label }}-{{ model_name }}">
                 {% if model.admin_url %}
                   <a href="{{ model.admin_url }}"{% if model.admin_url in request.path|urlencode %} aria-current="page"{% endif %}>{{ model.name }}</a>
                 {% else %}
@@ -19,16 +19,16 @@
               </th>
 
               {% if model.add_url %}
-                <td><a href="{{ model.add_url }}" class="addlink">{% translate 'Add' %}</a></td>
+                <td><a href="{{ model.add_url }}" class="addlink" aria-describedby="{{ app.app_label }}-{{ model_name }}">{% translate 'Add' %}</a></td>
               {% else %}
                 <td></td>
               {% endif %}
 
               {% if model.admin_url and show_changelinks %}
                 {% if model.view_only %}
-                  <td><a href="{{ model.admin_url }}" class="viewlink">{% translate 'View' %}</a></td>
+                  <td><a href="{{ model.admin_url }}" class="viewlink" aria-describedby="{{ app.app_label }}-{{ model_name }}">{% translate 'View' %}</a></td>
                 {% else %}
-                  <td><a href="{{ model.admin_url }}" class="changelink">{% translate 'Change' %}</a></td>
+                  <td><a href="{{ model.admin_url }}" class="changelink" aria-describedby="{{ app.app_label }}-{{ model_name }}">{% translate 'Change' %}</a></td>
                 {% endif %}
               {% elif show_changelinks %}
                 <td></td>
diff --git a/tests/admin_views/test_nav_sidebar.py b/tests/admin_views/test_nav_sidebar.py
index e9b367b63b..1875a2f7a1 100644
--- a/tests/admin_views/test_nav_sidebar.py
+++ b/tests/admin_views/test_nav_sidebar.py
@@ -111,9 +111,10 @@ class AdminSidebarTests(TestCase):
         self.assertContains(response, '<tr class="model-héllo current-model">')
         self.assertContains(
             response,
-            '<th scope="row">'
+            '<th scope="row" id="admin_views-héllo">'
             '<a href="/test_sidebar/admin/admin_views/h%C3%A9llo/" aria-current="page">'
             "Héllos</a></th>",
+            html=True,
         )
 
 
diff --git a/tests/admin_views/tests.py b/tests/admin_views/tests.py
index 98a77221b2..cb61c88941 100644
--- a/tests/admin_views/tests.py
+++ b/tests/admin_views/tests.py
@@ -1605,6 +1605,29 @@ class AdminViewBasicTest(AdminViewBasicTestCase):
             '<main id="content-start" class="content" tabindex="-1">',
         )
 
+    def test_aria_describedby_for_add_and_change_links(self):
+        response = self.client.get(reverse("admin:index"))
+        tests = [
+            ("admin_views", "actor"),
+            ("admin_views", "worker"),
+            ("auth", "group"),
+            ("auth", "user"),
+        ]
+        for app_label, model_name in tests:
+            with self.subTest(app_label=app_label, model_name=model_name):
+                row_id = f"{app_label}-{model_name}"
+                self.assertContains(response, f'<th scope="row" id="{row_id}">')
+                self.assertContains(
+                    response,
+                    f'<a href="/test_admin/admin/{app_label}/{model_name}/" '
+                    f'class="changelink" aria-describedby="{row_id}">Change</a>',
+                )
+                self.assertContains(
+                    response,
+                    f'<a href="/test_admin/admin/{app_label}/{model_name}/add/" '
+                    f'class="addlink" aria-describedby="{row_id}">Add</a>',
+                )
+
 
 @override_settings(
     AUTH_PASSWORD_VALIDATORS=[