From 859e3e5f848171d90eddc018ff18419faf20ea20 Mon Sep 17 00:00:00 2001
From: Bernard Siebens <bernard@siebens.org>
Date: Mon, 3 Aug 2026 21:37:04 +0200
Subject: [PATCH] Fix file uploads in modal forms: multi-file input rendering +
 enctype

Two bugs, both invisible until the news photo upload modal exercised
them: the shared field template didn't recognise a custom multi-file
widget (it fell through to a plain, useless text input), and the modal
form itself had no enctype="multipart/form-data" -- so even a correctly
rendered file input would have posted filenames only, never content.
---
 controlpanel/templates/controlpanel/_modal_form.html | 5 +++--
 controlpanel/templates/templatetags/field.html       | 1 +
 controlpanel/templatetags/ui.py                      | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/controlpanel/templates/controlpanel/_modal_form.html b/controlpanel/templates/controlpanel/_modal_form.html
index 12b879b..760a469 100644
--- a/controlpanel/templates/controlpanel/_modal_form.html
+++ b/controlpanel/templates/controlpanel/_modal_form.html
@@ -5,14 +5,15 @@
     `action_url`. Included with `modal_id`, `title`, `form`, `action_url`, `submit_label`
     and `submit_icon`, plus an optional `blurb`. The submit button sits outside the form
     tag (linked via the `form` attribute) so it can share the `modal-action` row with the
-    dialog-closing Cancel button without nesting one <form> inside another.
+    dialog-closing Cancel button without nesting one <form> inside another. `enctype` is
+    always multipart -- harmless for a form with no file field, required for one that has.
 {% endcomment %}
 {% trans "Save" as default_submit_label %}
 <dialog id="{{ modal_id }}" class="modal">
     <div class="modal-box">
         <h3 class="text-lg font-bold">{{ title }}</h3>
         {% if blurb %}<p class="py-2 text-sm opacity-70">{{ blurb }}</p>{% endif %}
-        <form method="post" action="{{ action_url }}" id="{{ modal_id }}-form">
+        <form method="post" action="{{ action_url }}" id="{{ modal_id }}-form" enctype="multipart/form-data">
             {% csrf_token %}
             {% include "controlpanel/_form_fields.html" %}
         </form>
diff --git a/controlpanel/templates/templatetags/field.html b/controlpanel/templates/templatetags/field.html
index d69077f..b2bec9c 100644
--- a/controlpanel/templates/templatetags/field.html
+++ b/controlpanel/templates/templatetags/field.html
@@ -92,6 +92,7 @@
                         class="file-input w-full {% if size_modifier %}file-input-{{ size_modifier }}{% endif %}"
                         name="{{ field.html_name }}"
                         {% if field.field.widget.attrs.accept %}accept="{{ field.field.widget.attrs.accept }}"{% endif %}
+                        {% if field.field.widget.attrs.multiple %}multiple{% endif %}
                 />
 
                 {% if field.value %}
diff --git a/controlpanel/templatetags/ui.py b/controlpanel/templatetags/ui.py
index 96e5113..d4808a4 100644
--- a/controlpanel/templatetags/ui.py
+++ b/controlpanel/templatetags/ui.py
@@ -158,7 +158,7 @@ def form_field(
             field_type = "checkbox"
         case "textarea" | "markdownx":
             field_type = "textarea"
-        case "clearablefile":
+        case "clearablefile" | "multiplefile":
             field_type = "file"
         case "selectmultiple":
             field_type = "select"