Skip to content

Commit 4d8de83

Browse files
authored
chore: Release 3.1.4 (#1482)
* Update CHANGELOG.rst * Update __init__.py * Fix: Crash when moving files from a filtered directory listing Co-authored-by: @W1ldPo1nter * Update CHANGELOG.rst
1 parent 1164e69 commit 4d8de83

File tree

3 files changed

+14
-5
lines changed

3 files changed

+14
-5
lines changed

CHANGELOG.rst

+12-2
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,22 @@
22
CHANGELOG
33
=========
44

5-
3.1.3 (2025-05-17)
5+
3.1.4 (2024-07-15)
6+
==================
7+
8+
* feat: Accept new `STORAGES` setting, introduced in Django 4.2 by @fsbraun in https://github.com/django-cms/django-filer/pull/1472
9+
* feat: Replace `render` with `TemplateResponse` in admin views by @fsbraun in https://github.com/django-cms/django-filer/pull/1473
10+
* fix: File expand url incorrect and worked not with custom image models by @fsbraun in https://github.com/django-cms/django-filer/pull/1471
11+
* fix: Crash when moving files from a filtered directory listing by @W1ldPo1nter in https://github.com/django-cms/django-filer/pull/1482
12+
* ci: pre-commit autoupdate by @pre-commit-ci in https://github.com/django-cms/django-filer/pull/1477
13+
14+
15+
3.1.3 (2024-05-17)
616
==================
717
* Fix: Folder select widget did not render correctly with standard Django admin
818
styles.
919

10-
3.1.2 (2025-05-17)
20+
3.1.2 (2024-05-17)
1121
==================
1222

1323
* Made the filer check command compatible with custom image models.

filer/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@
1313
8. Publish the release and it will automatically release to pypi
1414
"""
1515

16-
__version__ = '3.1.3'
16+
__version__ = '3.1.4'

filer/admin/folderadmin.py

+1-2
Original file line numberDiff line numberDiff line change
@@ -321,14 +321,13 @@ def directory_listing(self, request, folder_id=None, viewtype=None):
321321
order_by = request.GET.get('order_by', None)
322322
order_by_annotation = None
323323
if order_by is None:
324-
file_qs = file_qs.annotate(coalesce_sort_field=Coalesce(
324+
order_by_annotation = Lower(Coalesce(
325325
Case(
326326
When(name__exact='', then=None),
327327
When(name__isnull=False, then='name')
328328
),
329329
'original_filename'
330330
))
331-
order_by_annotation = Lower('coalesce_sort_field')
332331

333332
order_by = order_by.split(',') if order_by else []
334333
order_by = [field for field in order_by

0 commit comments

Comments
 (0)