Merge branch 'django-cms:master' into master

Author: fsbraun

.github/workflows/publish-to-live-pypi.yml

@@ -16,8 +16,8 @@ jobs:
       id-token: write
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python
-      uses: actions/setup-python@v4
+    - name: Set up Python 3.12
+      uses: actions/setup-python@v5
       with:
         python-version: '3.12'
 

.github/workflows/publish-to-test-pypi.yml

@@ -16,8 +16,8 @@ jobs:
       id-token: write
     steps:
     - uses: actions/checkout@v4
-    - name: Set up Python
-      uses: actions/setup-python@v4
+    - name: Set up Python 3.12
+      uses: actions/setup-python@v5
       with:
         python-version: '3.12'
 
@@ -39,5 +39,5 @@ jobs:
     - name: Publish distribution 📦 to Test PyPI
       uses: pypa/gh-action-pypi-publish@release/v1
       with:
-        repository-url: https://test.pypi.org/legacy/
-        skip-existing: true
+        repository_url: https://test.pypi.org/legacy/
+        skip_existing: true

.github/workflows/test.yml

@@ -8,20 +8,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ['3.8', '3.9', '3.10', '3.11']
+        python-version: ['3.10', '3.11', '3.12']
         requirements-file: [
-          django-3.2.txt,
-          django-4.0.txt,
-          django-4.1.txt,
           django-4.2.txt,
           django-5.0.txt,
+          django-main.txt,
         ]
         custom-image-model: [false, true]
-        exclude:
-          - requirements-file: django-5.0.txt
-            python-version: 3.8
-          - requirements-file: django-5.0.txt
-            python-version: 3.9
         os: [
           ubuntu-20.04,
         ]

.pre-commit-config.yaml

@@ -21,7 +21,7 @@ repos:
 #        args: [--target-version, "2.2"]
 
   - repo: https://github.com/PyCQA/flake8
-    rev: 7.0.0
+    rev: 7.1.0
     hooks:
       - id: flake8
 

CHANGELOG.rst

@@ -2,6 +2,24 @@
 CHANGELOG
 =========
 
+3.1.3 (2025-05-17)
+==================
+* Fix: Folder select widget did not render correctly with standard Django admin
+  styles.
+
+3.1.2 (2025-05-17)
+==================
+
+* Made the filer check command compatible with custom image models.
+* Use the final image model's app label to determine the expand view URL.
+* Prepare the image expand URL in the admin code and pass it through to the template via context.
+* Fix #1377: Field `verbose_name` should use `gettext_lazy`.
+* Fix: styles for django 4.2+ admin.
+* Fix: Unintended scroll when clearing file widget.
+* Fix: Method `ImageAdminForm.clean_subject_location()` not implemented correctly causing invokation
+  of `clean()` twice.
+
+
 3.1.1 (2023-11-18)
 ==================
 

docs/settings.rst

@@ -69,7 +69,9 @@ e.g::
 
 Defaults to FileSystemStorage in ``<MEDIA_ROOT>/filer_public/`` and ``<MEDIA_ROOT>/filer_public_thumbnails/`` for public files and
 ``<MEDIA_ROOT>/../smedia/filer_private/`` and ``<MEDIA_ROOT>/../smedia/filer_private_thumbnails/`` for private files.
-Public storage uses ``DEFAULT_FILE_STORAGE`` as default storage backend.
+Public storage uses the default storage's backend. This is taken from Django's ``STORAGES``
+setting if it exists or, if not, from the ``DEFAULT_FILE_STORAGE`` setting for compatibility
+with earlier Django versions (5.0 or below).
 
 ``UPLOAD_TO`` is the function to generate the path relative to the storage root. The
 default generates a random path like ``1d/a5/1da50fee-5003-46a1-a191-b547125053a8/filename.jpg``. This

filer/__init__.py

@@ -13,4 +13,4 @@
  8. Publish the release and it will automatically release to pypi
 """
 
-__version__ = '3.1.1'
+__version__ = '3.1.3'

filer/admin/fileadmin.py

@@ -192,7 +192,7 @@ def get_model_perms(self, request):
     def display_canonical(self, instance):
         canonical = instance.canonical_url
         if canonical:
-            return mark_safe('<a href="{}">{}</a>'.format(canonical, canonical))
+            return mark_safe(f'<a href="{canonical}">{canonical}</a>')
         else:
             return '-'
     display_canonical.allow_tags = True

filer/admin/folderadmin.py

@@ -16,7 +16,8 @@
 from django.db.models import Case, F, OuterRef, Subquery, When
 from django.db.models.functions import Coalesce, Lower
 from django.http import HttpResponse, HttpResponseRedirect
-from django.shortcuts import get_object_or_404, render
+from django.shortcuts import get_object_or_404
+from django.template.response import TemplateResponse
 from django.urls import path, reverse
 from django.utils.encoding import force_str
 from django.utils.html import escape, format_html
@@ -253,10 +254,10 @@ def directory_listing(self, request, folder_id=None, viewtype=None):
                 self.get_queryset(request).get(id=last_folder_id)
             except self.model.DoesNotExist:
                 url = reverse('admin:filer-directory_listing-root')
-                url = "{}{}".format(url, admin_url_params_encoded(request))
+                url = f"{url}{admin_url_params_encoded(request)}"
             else:
                 url = reverse('admin:filer-directory_listing', kwargs={'folder_id': last_folder_id})
-                url = "{}{}".format(url, admin_url_params_encoded(request))
+                url = f"{url}{admin_url_params_encoded(request)}"
             return HttpResponseRedirect(url)
         elif folder_id is None:
             folder = FolderRoot()
@@ -480,7 +481,7 @@ def directory_listing(self, request, folder_id=None, viewtype=None):
             'enable_permissions': settings.FILER_ENABLE_PERMISSIONS,
             'can_make_folder': request.user.is_superuser or (folder.is_root and settings.FILER_ALLOW_REGULAR_USERS_TO_ADD_ROOT_FOLDERS) or permissions.get("has_add_children_permission"),
         })
-        return render(request, self.directory_listing_template, context)
+        return TemplateResponse(request, self.directory_listing_template, context)
 
     def filter_folder(self, qs, terms=()):
         # Source: https://github.com/django/django/blob/1.7.1/django/contrib/admin/options.py#L939-L947  flake8: noqa
@@ -814,7 +815,7 @@ def delete_files_or_folders(self, request, files_queryset, folders_queryset):
         })
 
         # Display the destination folder selection page
-        return render(
+        return TemplateResponse(
             request,
             "admin/filer/delete_selected_files_confirmation.html",
             context
@@ -840,7 +841,7 @@ def _format_callback(self, obj, user, admin_site, perms_needed):
         else:
             # Don't display link to edit, because it either has no
             # admin or is edited inline.
-            return '{}: {}'.format(capfirst(opts.verbose_name), force_str(obj))
+            return f'{capfirst(opts.verbose_name)}: {force_str(obj)}'
 
     def _check_copy_perms(self, request, files_queryset, folders_queryset):
         try:
@@ -954,7 +955,7 @@ def move_files_and_folders(self, request, files_queryset, folders_queryset):
         })
 
         # Display the destination folder selection page
-        return render(request, "admin/filer/folder/choose_move_destination.html", context)
+        return TemplateResponse(request, "admin/filer/folder/choose_move_destination.html", context)
 
     move_files_and_folders.short_description = _("Move selected files and/or folders")
 
@@ -1037,7 +1038,7 @@ def rename_files(self, request, files_queryset, folders_queryset):
         })
 
         # Display the rename format selection page
-        return render(request, "admin/filer/folder/choose_rename_format.html", context)
+        return TemplateResponse(request, "admin/filer/folder/choose_rename_format.html", context)
 
     rename_files.short_description = _("Rename files")
 
@@ -1073,7 +1074,7 @@ def _get_available_name(self, destination, name):
         count = itertools.count(1)
         original = name
         while destination.contains_folder(name):
-            name = "{}_{}".format(original, next(count))
+            name = f"{original}_{next(count)}"
         return name
 
     def _copy_folder(self, folder, destination, suffix, overwrite):
@@ -1169,7 +1170,7 @@ def copy_files_and_folders(self, request, files_queryset, folders_queryset):
         })
 
         # Display the destination folder selection page
-        return render(request, "admin/filer/folder/choose_copy_destination.html", context)
+        return TemplateResponse(request, "admin/filer/folder/choose_copy_destination.html", context)
 
     copy_files_and_folders.short_description = _("Copy selected files and/or folders")
 
@@ -1298,6 +1299,6 @@ def resize_images(self, request, files_queryset, folders_queryset):
         })
 
         # Display the resize options page
-        return render(request, "admin/filer/folder/choose_images_resize_options.html", context)
+        return TemplateResponse(request, "admin/filer/folder/choose_images_resize_options.html", context)
 
     resize_images.short_description = _("Resize selected images")

filer/admin/imageadmin.py

@@ -1,5 +1,6 @@
 from django import forms
-from django.shortcuts import get_object_or_404, render
+from django.shortcuts import get_object_or_404
+from django.template.response import TemplateResponse
 from django.urls import path
 from django.utils.translation import gettext as _
 from django.utils.translation import gettext_lazy
@@ -95,9 +96,13 @@ def get_urls(self):
 
     def expand_view(self, request, file_id):
         image = get_object_or_404(self.model, pk=file_id)
-        return render(request, "admin/filer/image/expand.html", context={
-            "original_url": image.url
-        })
+        return TemplateResponse(
+            request,
+            "admin/filer/image/expand.html",
+            context={
+                "original_url": image.url
+            },
+        )
 
 
 if FILER_IMAGE_MODEL == 'filer.Image':