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

fix: Unique url names for file icon #1423

Merged
merged 10 commits into from
Sep 19, 2023
Merged

fix: Unique url names for file icon #1423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
accd80c
Fix #1377
fsbraun Jul 7, 2023
1ec6d3b
Merge branch 'master' of github.com:django-cms/django-filer
fsbraun Jul 10, 2023
50bb9fb
Merge branch 'django-cms:master' into master
fsbraun Jul 12, 2023
f046125
Merge branch 'django-cms:master' into master
fsbraun Jul 14, 2023
d7809dd
Merge branch 'django-cms:master' into master
fsbraun Aug 1, 2023
32770ea
Merge branch 'django-cms:master' into master
fsbraun Aug 4, 2023
01c9f35
Merge branch 'django-cms:master' into master
fsbraun Aug 20, 2023
a625d80
Merge branch 'django-cms:master' into master
fsbraun Sep 6, 2023
556dacb
Merge branch 'django-cms:master' into master
fsbraun Sep 18, 2023
6b7d1ce
Fix: Ensure uniqueness of admin url names
fsbraun Sep 18, 2023
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
5 changes: 5 additions & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@
CHANGELOG
=========

unreleased
==========

* fix: ensure uniqueness of icon admin url names

3.0.6 (2023-09-08)
==================

Expand Down
2 changes: 1 addition & 1 deletion filer/admin/fileadmin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ def get_urls(self):
return super().get_urls() + [
path("icon/<int:file_id>/<int:size>",
self.admin_site.admin_view(self.icon_view),
name="filer_file_fileicon")
name=f"filer_{self.model._meta.model_name}_fileicon")
]

def icon_view(self, request, file_id: int, size: int) -> HttpResponse:
Expand Down
Loading