diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-08-05 12:06:14 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2022-12-12 12:23:17 +0100 |
| commit | 722dcb00774ca1f7dfb38d0941ec0047e3fdb661 (patch) | |
| tree | 09ea33ca680f22c0bf65b7cdf2db8a3fb0550f6f /ishtar_common | |
| parent | 3c706ecd3db631350a2e59fc9bc1bca8653e2137 (diff) | |
| download | Ishtar-722dcb00774ca1f7dfb38d0941ec0047e3fdb661.tar.bz2 Ishtar-722dcb00774ca1f7dfb38d0941ec0047e3fdb661.zip | |
Fix bug for vanilla installation (db query before db is initialize)
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/admin.py | 3 | ||||
| -rw-r--r-- | ishtar_common/version.py | 4 |
2 files changed, 5 insertions, 2 deletions
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(): |