Merge branch 'master' into version-3.1.2

CHANGELOG.rst

@@ -7,7 +7,6 @@ CHANGELOG
 * Fix: Folder select widget did not render correctly with standard Django admin
   styles.
 
-
 3.1.2 (2025-05-17)
 ==================
 

filer/admin/fileadmin.py

@@ -48,7 +48,7 @@ def clean(self):
             validate_upload(
                 file_name=cleaned_data["file"].name,
                 file=file.file,
-                owner=cleaned_data["owner"],
+                owner=cleaned_data.get("owner"),
                 mime_type=mime_type,
             )
             file.open("r")

filer/private/sass/components/_drag-and-drop.scss

@@ -11,6 +11,13 @@ form .form-row {
             display: none;
         }
     }
+    .filer-widget + .related-widget-wrapper-link,
+    .filer-widget + * + .related-widget-wrapper-link {
+        display: none;
+    }
+    .related-widget-wrapper:has(.filer-widget,.filer-dropzone) {
+        width: 100%;
+    }
     .filer-dropzone {
         @include clearfix;
         position: relative;

filer/templates/admin/filer/folder/directory_table_list.html

@@ -47,7 +47,7 @@
                                 {% if filer_admin_context.pick_folder and item.file_type == 'Folder' %}
                                     <a class="insertlink insertlinkButton"
                                         href="#" onclick="opener.dismissRelatedFolderLookupPopup(window, '{{ subfolder.pk|safe }}', '{{ subfolder.pretty_logical_path }}'); return false;" >
-                                        <span class="fa fa-arrow-left filer-icon cms-icon-select"></span>
+                                        <span class="fa fa-arrow-left filer-icon filer-icon-select"></span>
                                     </a>
                                 {% elif action_form and item.pk and not is_popup %}
                                     <input type="checkbox" class="action-select" value="folder-{{ item.pk|safe }}" name="_selected_action">

filer/templates/admin/filer/widgets/admin_folder.html

@@ -3,6 +3,10 @@
 {% spaceless %}
     <div class="filer-dropzone filer-dropzone-folder">
         <span class="filerFile">
+            <a href="{{ lookup_url }}" class="related-lookup{% if object %} hidden{% endif %}" id="{{ lookup_name }}" title="{% trans 'Lookup' %}">
+                <span class="fa fa-search cms-icon cms-icon-search"></span>&nbsp;
+                {% trans "Choose Folder" %}
+            </a>
             <img src="{% static "filer/icons/folder.svg" %}" class="thumbnail_img{% if not object %} hidden{% endif %}"/>
             <span id="{{ span_id }}" style="margin-left: 15px;">
                 <span class="description_text">
@@ -11,10 +15,6 @@
                     {% endif %}
                 </span>
             </span>
-            <a href="{{ lookup_url }}" class="related-lookup{% if object %} hidden{% endif %}" id="{{ lookup_name }}" title="{% trans 'Lookup' %}">
-                <span class="fa fa-search cms-icon cms-icon-search"></span>&nbsp;
-                {% trans "Choose Folder" %}
-            </a>
             <a class="filerClearer {% if not object %}hidden{% endif %}" id="{{ clear_id }}" title="{% translate 'Clear' %}" href="#">
                 <span class="fa fa-close filer-icon filer-icon-remove-selection"></span>
             </a>