BEN-2954: Rebase Django-Filer to original Repo#157
Open
andreilupuleasa wants to merge 53 commits into
Open
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>
* BEN-3407: (21 commits)
BEN-3407: pin versions, cache tests added
BEN-3407: Here's a summary of the change: Problem: When Django loads a File instance with deferred fields, __init__ was normalizing DEFERRED to empty defaults ('', None). This meant change-detection (replaced_file, _is_path_changed) would compare against those fake defaults and almost always see a "change", triggering unnecessary _copy_file() / update_location_on_storage() calls that could overwrite storage paths. Fix: Introduced _UNKNOWN = object() sentinel. When a field is deferred: _old_sha1, _old_name, _old_folder_id are set to _UNKNOWN instead of ''/None _is_path_changed() returns False if either _old_name or _old_folder_id is _UNKNOWN _is_name_changed() returns False if _old_name is _UNKNOWN replaced_file is False if _old_sha1 is _UNKNOWN Cache invalidation for old folder is skipped if _old_folder_id is _UNKNOWN This ensures that instances with deferred fields skip change-detection entirely rather than producing false positives.
BEN-3407: read cache key from settings and add fallback
Potential fix for pull request finding
BEN-3407: upstream merges removed from this pr
BEN-3407: fix setup
BEN-3407: Handle hidden fields
BEN-3407: remove duplicate imports
Potential fix for pull request finding
BEN-3407: debug logging removed
Potential fix for pull request finding
Potential fix for pull request finding
BEN-3407: remove getattr where models instances are used
BEN-3407: The issue was that Django 5.1 removed BaseForm._html_output() (deprecated since Django 4.0). The AsPWithHelpMixin.as_p_with_help() method now manually iterates form fields and renders the same HTML structure without relying on the removed internal method.
BEN-3407: invalidate folder caching
BEN-3407: fix myme type tests
Revert "BEN-3407: logs added"
BEN-3407: logs added
BEN-3407: fix mim file
BEN-3407: fix bento meme types
...
# Conflicts:
# filer/admin/clipboardadmin.py
# filer/admin/forms.py
# filer/models/filemodels.py
# filer/models/foldermodels.py
added 14 commits
May 28, 2026 13:00
* master_pbs:
added 24 commits
June 9, 2026 15:33
pyproject.toml updated
…kage with django-filer and not bento3 commit sha
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.
No description provided.