Merge upstream django-cms/django-filer v3.4.4 into PBS fork#156
Draft
Merge upstream django-cms/django-filer v3.4.4 into PBS fork#156
Conversation
…itions Agent-Logs-Url: https://github.com/pbs/django-filer/sessions/cad30a66-0889-48ba-bb3e-2ab3bf2939b2 Co-authored-by: andreilupuleasa <124138251+andreilupuleasa@users.noreply.github.com>
…models, clipboardmodels, virtualitems) and settings Agent-Logs-Url: https://github.com/pbs/django-filer/sessions/cad30a66-0889-48ba-bb3e-2ab3bf2939b2 Co-authored-by: andreilupuleasa <124138251+andreilupuleasa@users.noreply.github.com>
…ns preserved Agent-Logs-Url: https://github.com/pbs/django-filer/sessions/cad30a66-0889-48ba-bb3e-2ab3bf2939b2 Co-authored-by: andreilupuleasa <124138251+andreilupuleasa@users.noreply.github.com>
…ilOption, FolderPermission, mime_type, etc.) Agent-Logs-Url: https://github.com/pbs/django-filer/sessions/cad30a66-0889-48ba-bb3e-2ab3bf2939b2 Co-authored-by: andreilupuleasa <124138251+andreilupuleasa@users.noreply.github.com>
…, restore needed PBS utils Agent-Logs-Url: https://github.com/pbs/django-filer/sessions/cad30a66-0889-48ba-bb3e-2ab3bf2939b2 Co-authored-by: andreilupuleasa <124138251+andreilupuleasa@users.noreply.github.com>
Agent-Logs-Url: https://github.com/pbs/django-filer/sessions/cad30a66-0889-48ba-bb3e-2ab3bf2939b2 Co-authored-by: andreilupuleasa <124138251+andreilupuleasa@users.noreply.github.com>
Copilot created this pull request from a session on behalf of
andreilupuleasa
April 30, 2026 10:03
View session
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merges ~1,977 upstream commits from django-cms/django-filer (v3.4.4) into the PBS fork while preserving all PBS-specific customizations. The codebases diverged ~790 PBS commits and ~1,977 upstream commits since the v0.9 fork point, making a direct
git mergeimpractical — this is a phased manual merge.New from upstream
pyproject.tomlbuild system, version bumped to3.5.0.pbs.1FolderPermissionmodel with per-user/group/everybody folder ACLs + cache layer (filer/cache.py)ThumbnailOptionmodel and adminfiler/validation.py)filer/urls.py,filer/views.py)FILER_IMAGE_MODELsettingBaseImageabstract model (filer/models/abstract.py) — SVG/HEIF supportfiler/contrib/django_cms/)apps.pyready()hook — MIME type registration, validator resolution, optional HEIF supportPBS features preserved
@trashabledecorator,soft_delete()/hard_delete()/restore(),TrashFileManager/AliveFileManager,TrashAdminsiteFK,sharedM2M,folder_type(SITE_FOLDER/CORE_FOLDER),is_core(),is_readonly_for_user()restrictedfield on File/Folder,can_restrict_on_site(),cms_rolesintegrationFOLDER_AFFECTS_URL, SHA1 hash prefix (actual_name),FILER_NOHASH_ROOTFOLDERS,update_location_on_storage()with atomic transactionsPrivateFileSystemStorage.copy(),BotoClientErrorfallbackCDN_DOMAIN,CDN_INVALIDATION_TIMEDEFERREDsentinel handling inFile.__init__,STORAGES['default']injection,has_view_permissionoverridesOneToOneFielduser,folder_name,delete_clipboard()Migration
Single migration
0008appended to the existing PBS chain (0001–0007):ThumbnailOption,FolderPermissionmime_typeto File,_transparentto ImageTest status
82/153 tests pass. Known remaining work for follow-up:
MultiStorageFieldFileserve()to accept model instances)