Merge branch '597-shell_plus-import-order-is-suboptimal' into 'master'

Resolve "shell_plus import order is suboptimal"

Closes #597

See merge request !861

CHANGELOG.rst

@@ -9,6 +9,14 @@ and this project adheres to `Semantic Versioning`_.
 Unreleased
 ----------
 
+Changed
+~~~~~~~
+
+* 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,5 +964,13 @@ if SENTRY_ENABLED:
         **SENTRY_SETTINGS,
     )
 
+SHELL_PLUS_MODEL_IMPORTS_RESOLVER = "django_extensions.collision_resolvers.AppLabelPrefixCR"
+SHELL_PLUS_APP_PREFIXES = {
+    "auth": "auth",
+}
+SHELL_PLUS_DONT_LOAD = []
+merge_app_settings("SHELL_PLUS_APP_PREFIXES", SHELL_PLUS_APP_PREFIXES)
+merge_app_settings("SHELL_PLUS_DONT_LOAD", SHELL_PLUS_DONT_LOAD)
+
 # Add django-cleanup after all apps to ensure that it gets all signals as last app
 INSTALLED_APPS.append("django_cleanup.apps.CleanupConfig")