diff options
Diffstat (limited to 'ishtar_common')
| -rw-r--r-- | ishtar_common/admin.py | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/ishtar_common/admin.py b/ishtar_common/admin.py index cfd06bea5..beb213689 100644 --- a/ishtar_common/admin.py +++ b/ishtar_common/admin.py @@ -30,7 +30,6 @@ 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 @@ -2133,9 +2132,7 @@ class ApiUserAdmin(admin.ModelAdmin): admin_site.register(models_rest.ApiUser, ApiUserAdmin) -def get_main_content_types_query(): - if not apps.ready: - return +def get_api_choices(): pks = [] for app_label, model_name in models_rest.MAIN_CONTENT_TYPES: try: @@ -2143,7 +2140,7 @@ def get_main_content_types_query(): pks.append(ct.pk) except ContentType.DoesNotExist: pass - return ContentType.objects.filter(pk__in=pks) + return {"pk__in": pks} class ApiSearchModelAdminForm(forms.ModelForm): @@ -2152,7 +2149,8 @@ class ApiSearchModelAdminForm(forms.ModelForm): exclude = [] content_type = forms.ModelChoiceField( - label=_("Content type"), queryset=get_main_content_types_query() + label=_("Content type"), queryset=ContentType.objects, + limit_choices_to=get_api_choices ) |