Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion app_helper/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,11 @@ def _make_settings(args, application, settings, STATIC_ROOT, MEDIA_ROOT): # NOQ
if "treebeard" not in default_settings["INSTALLED_APPS"]:
default_settings["INSTALLED_APPS"].append("treebeard")
if "filer" in default_settings["INSTALLED_APPS"] and "mptt" not in default_settings["INSTALLED_APPS"]:
default_settings["INSTALLED_APPS"].append("mptt")
from filer import __version__

if __version__ < "3":
# As of django-filer 3.0 mptt is not needed as a dependency
default_settings["INSTALLED_APPS"].append("mptt")
if "filer" in default_settings["INSTALLED_APPS"] and "easy_thumbnails" not in default_settings["INSTALLED_APPS"]:
default_settings["INSTALLED_APPS"].append("easy_thumbnails")

Expand Down
1 change: 1 addition & 0 deletions changes/225.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Do not add mptt with django-filer 3+