Merge branch 'django-cms:master' into master

Author: fsbraun

CHANGELOG.rst

@@ -2,6 +2,12 @@
 CHANGELOG
 =========
 
+3.0.6 (2023-09-08)
+==================
+
+* Re-add alphabetical sorting as default (fixes #1415) by @filipweidemann in https://github.com/django-cms/django-filer/pull/1416
+* fix: django-storage 1.14 complains about files being opened twice when copying by @fsbraun in https://github.com/django-cms/django-filer/pull/1418
+
 3.0.5 (2023-08-22)
 ==================
 

filer/__init__.py

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

filer/admin/folderadmin.py

@@ -13,7 +13,7 @@
 from django.core.exceptions import PermissionDenied, ValidationError
 from django.core.paginator import EmptyPage, PageNotAnInteger, Paginator
 from django.db import models, router
-from django.db.models import F, OuterRef, Subquery, Case, When
+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

filer/models/filemodels.py

@@ -229,9 +229,9 @@ def _move_file(self):
         self.is_public = not self.is_public
         self.file.delete_thumbnails()
         self.is_public = not self.is_public
+        src_file = src_storage.open(src_file_name)
         # This is needed because most of the remote File Storage backend do not
         # open the file.
-        src_file = src_storage.open(src_file_name)
         # Context manager closes file after reading contents
         with src_file.open() as f:
             content_file = ContentFile(f.read())
@@ -254,10 +254,14 @@ def _copy_file(self, destination, overwrite=False):
         src_file_name = self.file.name
         storage = self.file.storages['public' if self.is_public else 'private']
 
-        # This is needed because most of the remote File Storage backend do not
-        # open the file.
         src_file = storage.open(src_file_name)
-        src_file.open()
+        try:
+            # This is needed because most of the remote File Storage backend do not
+            # open the file. Re-opening would create a value error.
+            src_file.open()
+        except ValueError:  # pragma: no cover
+            # If a validation error is raised, the file is already open.
+            pass
         return storage.save(destination, ContentFile(src_file.read()))
 
     def generate_sha1(self):