From d61fdfc2c6edda04b8863c6d10ed032933f50dbf Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Fri, 5 Aug 2022 12:06:14 +0200
Subject: Fix bug for vanilla installation (db query before db is initialize)

---
 CHANGES.md               | 9 ++++++++-
 ishtar_common/admin.py   | 3 +++
 ishtar_common/version.py | 4 ++--
 3 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/CHANGES.md b/CHANGES.md
index 17d59f7b7..a24159059 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,11 +1,18 @@
 ---
 title: Ishtar changelog
-date: 2022-07-27
+date: 2022-08-05
 ---
 
 Ishtar changelog
 ================
 
+v4.0.12 - 2022-08-05
+--------------------
+
+### Bug fix ###
+
+- fix bug for vanilla installation (db query before db is initialize)
+
 v4.0.11 - 2022-08-02
 --------------------
 
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py
index fd74ee9d4..c883a744c 100644
--- a/ishtar_common/admin.py
+++ b/ishtar_common/admin.py
@@ -30,6 +30,7 @@ import zipfile
 from rest_framework.authtoken.admin import TokenAdmin
 from rest_framework.authtoken.models import Token
 
+from django.apps import apps
 from django.conf import settings
 from django.conf.urls import url
 from django.contrib import admin, messages
@@ -2127,6 +2128,8 @@ admin_site.register(models_rest.ApiUser, ApiUserAdmin)
 
 
 def get_main_content_types_query():
+    if not apps.ready:
+        return
     pks = []
     for app_label, model_name in models_rest.MAIN_CONTENT_TYPES:
         try:
diff --git a/ishtar_common/version.py b/ishtar_common/version.py
index 8f1c213f0..80a1d2738 100644
--- a/ishtar_common/version.py
+++ b/ishtar_common/version.py
@@ -1,5 +1,5 @@
-# 4.0.11
-VERSION = (4, 0, 11)
+# 4.0.12
+VERSION = (4, 0, 12)
 
 
 def get_version():
-- 
cgit v1.2.3