Resolve collisions in shell_plus by prefixing with app_label

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
 -------------------

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",
 }