From ed3e366a1da2f1c86c7d813d664a5ea3f365e3d1 Mon Sep 17 00:00:00 2001
From: Dominik George <dominik.george@teckids.org>
Date: Mon, 3 Jan 2022 18:09:57 +0100
Subject: [PATCH] Resolve collisions in shell_plus by prefixing with app_label
---
CHANGELOG.rst | 10 ++++------
aleksis/core/settings.py | 1 +
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index ea4b085c7..34b3e1023 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -9,15 +9,13 @@ and this project adheres to `Semantic Versioning`_.
Unreleased
----------
-Added
-~~~~~
-
-* Apps can extend SHELL_PLUS_APP_PREFIXES and SHELL_PLUS_DONT_LOAD
-
Changed
~~~~~~~
-* core.Group model now takes precedence over auth.Group in shell_plus
+* Improvements for shell_plus module loading
+ * core.Group model now takes precedence over auth.Group
+ * Name collisions are resolved by prefixing with the app label
+ * Apps can extend SHELL_PLUS_APP_PREFIXES and SHELL_PLUS_DONT_LOAD
`2.5`_ – 2022-01-02
-------------------
diff --git a/aleksis/core/settings.py b/aleksis/core/settings.py
index 7ae9be8e7..ae84059c0 100644
--- a/aleksis/core/settings.py
+++ b/aleksis/core/settings.py
@@ -964,6 +964,7 @@ if SENTRY_ENABLED:
**SENTRY_SETTINGS,
)
+SHELL_PLUS_MODEL_IMPORTS_RESOLVER = "django_extensions.collision_resolvers.AppLabelPrefixCR"
SHELL_PLUS_APP_PREFIXES = {
"auth": "auth",
}
--
GitLab