Merge pull request #612 from karrioapi/patch-2024.6-rc9

[release-candidate] 2024.6-rc9
karrioapi · Jul 19, 2024 · bea6d56 · bea6d56
2 parents 7fe83d5 + a797ea2
commit bea6d56
Show file tree

Hide file tree

Showing 305 changed files with 22,745 additions and 47,048 deletions.
diff --git a/.env b/.env
@@ -1,4 +1,5 @@
 DEBUG_MODE=True
+ADMIN_DASHBOARD=True
 ALLOWED_HOSTS=*
 DATABASE_NAME=db.sqlite3
 # DATABASE_ENGINE=postgresql

diff --git a/apps/api/karrio/server/VERSION b/apps/api/karrio/server/VERSION
@@ -1 +1 @@
-2024.6-rc8
+2024.6-rc9
diff --git a/apps/api/karrio/server/settings/base.py b/apps/api/karrio/server/settings/base.py
@@ -158,9 +158,9 @@
 ALLOW_MULTI_ACCOUNT = config(
     "ALLOW_MULTI_ACCOUNT", default=MULTI_ORGANIZATIONS, cast=bool
 )
-ADMIN_DASHBOARD = (
-    importlib.util.find_spec("karrio.server.admin") is not None  # type:ignore
-)
+ADMIN_DASHBOARD = importlib.util.find_spec(  # type:ignore
+    "karrio.server.admin"
+) is not None and config("ADMIN_DASHBOARD", default=False, cast=bool)
 ORDERS_MANAGEMENT = (
     importlib.util.find_spec("karrio.server.orders") is not None  # type:ignore
 )

diff --git a/apps/api/karrio/server/static/karrio/js/karrio.js.map b/apps/api/karrio/server/static/karrio/js/karrio.js.map