Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Release 3.1.4 #1482

Merged
merged 4 commits into from
Jul 23, 2024
Merged

chore: Release 3.1.4 #1482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e6858fe
Update CHANGELOG.rst
fsbraun Jul 15, 2024
3dc3a52
Update __init__.py
fsbraun Jul 15, 2024
4b0b5ec
Fix: Crash when moving files from a filtered directory listing
fsbraun Jul 15, 2024
f29f020
Update CHANGELOG.rst
fsbraun Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,22 @@
CHANGELOG
=========

3.1.3 (2025-05-17)
3.1.4 (2024-07-15)
==================

* feat: Accept new `STORAGES` setting, introduced in Django 4.2 by @fsbraun in https://github.com/django-cms/django-filer/pull/1472
* feat: Replace `render` with `TemplateResponse` in admin views by @fsbraun in https://github.com/django-cms/django-filer/pull/1473
* fix: File expand url incorrect and worked not with custom image models by @fsbraun in https://github.com/django-cms/django-filer/pull/1471
* fix: Crash when moving files from a filtered directory listing by @W1ldPo1nter in https://github.com/django-cms/django-filer/pull/1482
* ci: pre-commit autoupdate by @pre-commit-ci in https://github.com/django-cms/django-filer/pull/1477


3.1.3 (2024-05-17)
==================
* Fix: Folder select widget did not render correctly with standard Django admin
styles.

3.1.2 (2025-05-17)
3.1.2 (2024-05-17)
==================

* Made the filer check command compatible with custom image models.
Expand Down
2 changes: 1 addition & 1 deletion filer/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
8. Publish the release and it will automatically release to pypi
"""

__version__ = '3.1.3'
__version__ = '3.1.4'
3 changes: 1 addition & 2 deletions filer/admin/folderadmin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,14 +321,13 @@ def directory_listing(self, request, folder_id=None, viewtype=None):
order_by = request.GET.get('order_by', None)
order_by_annotation = None
if order_by is None:
file_qs = file_qs.annotate(coalesce_sort_field=Coalesce(
order_by_annotation = Lower(Coalesce(
Case(
When(name__exact='', then=None),
When(name__isnull=False, then='name')
),
'original_filename'
))
order_by_annotation = Lower('coalesce_sort_field')

order_by = order_by.split(',') if order_by else []
order_by = [field for field in order_by
Expand Down
Loading