[pull] main from django:main

django/contrib/admin/static/admin/css/responsive.css

@@ -301,6 +301,7 @@ button {
     .stacked ul.selector-chooser {
         padding: 0 2px;
         transform: none;
+        margin: 10px auto;
     }
 
     .stacked .selector-chooser li {
@@ -571,6 +572,7 @@ button {
         height: 30px;
         padding: 0 2px;
         transform: none;
+        margin: auto;
     }
 
     .selector ul.selector-chooser li {

django/contrib/admin/static/admin/css/widgets.css

@@ -241,7 +241,7 @@
     display: flex;
     height: 30px;
     width: 64px;
-    margin: 0 0 10px 40%;
+    margin: 0 auto 10px auto;
     background-color: #eee;
     border-radius: 10px;
     transform: none;
@@ -628,7 +628,6 @@ ul.timelist,
 .related-widget-wrapper {
     display: flex;
     gap: 0 10px;
-    flex-grow: 1;
     flex-wrap: wrap;
     margin-bottom: 5px;
 }

django/test/client.py

@@ -295,7 +295,10 @@ def is_file(thing):
     # Each bit of the multipart form data could be either a form value or a
     # file, or a *list* of form values and/or files. Remember that HTTP field
     # names can be duplicated!
-    for key, value in data.items():
+    # Use lists() if data is a MultiValueDict, so that all values for a key
+    # are preserved (e.g. a form field and a file sharing the same name).
+    raw_data = getattr(data, "lists", data.items)()
+    for key, value in raw_data:
         if value is None:
             raise TypeError(
                 "Cannot encode None for key '%s' as POST data. Did you mean "

tests/admin_widgets/tests.py

@@ -1861,6 +1861,23 @@ def test_form_submission_via_enter_key_with_filter_horizontal(self):
             school.alumni.all().order_by("name"), [self.lisa, self.peter]
         )
 
+    @screenshot_cases(["desktop_size", "mobile_size", "rtl", "dark", "high_contrast"])
+    def test_vertical_arrow_buttons_layout(self):
+        from selenium.webdriver.common.by import By
+
+        self.admin_login(username="super", password="secret", login_url="/")
+        self.selenium.get(
+            self.live_server_url
+            + reverse("admin:admin_widgets_school_change", args=(self.school.id,))
+        )
+        students = self.selenium.find_element(By.CSS_SELECTOR, ".field-students")
+        self.selenium.execute_script("window.scrollTo(0, %s);" % students.location["y"])
+        buttons = self.selenium.find_element(
+            By.CSS_SELECTOR, "div.selector.stacked ul.selector-chooser"
+        )
+        self.assertTrue(buttons.is_displayed())
+        self.take_screenshot("arrow_buttons")
+
 
 class AdminRawIdWidgetSeleniumTests(AdminWidgetSeleniumTestCase):
     def setUp(self):

tests/test_client/tests.py

@@ -27,6 +27,7 @@
 
 from django.contrib.auth.models import Permission, User
 from django.core import mail
+from django.core.files.uploadedfile import SimpleUploadedFile
 from django.http import HttpResponse, HttpResponseNotAllowed
 from django.test import (
     AsyncRequestFactory,
@@ -38,6 +39,7 @@
     override_settings,
 )
 from django.urls import reverse_lazy
+from django.utils.datastructures import MultiValueDict
 from django.utils.decorators import async_only_middleware
 from django.views.generic import RedirectView
 
@@ -1045,6 +1047,23 @@ def test_uploading_named_temp_file(self):
             )
         self.assertEqual(response.content, b"named_temp_file")
 
+    def test_uploading_file_and_field_with_same_name(self):
+        """
+        A form field and file uploads sharing the same name in a
+        MultiValueDict are both preserved when posted by the test client.
+        """
+        file = SimpleUploadedFile("file.txt", b"content")
+        response = self.client.post(
+            "/upload_view/",
+            data=MultiValueDict({"shared": ["field_value", file]}),
+        )
+        request = response.wsgi_request
+        self.assertEqual(request.POST.getlist("shared"), ["field_value"])
+        self.assertEqual(
+            [f.name for f in request.FILES.getlist("shared")],
+            ["file.txt"],
+        )
+
     def test_query_params(self):
         tests = (
             "get",