misc: avoid circular imports (#21978)
This commit is contained in:
parent
1c9317f68e
commit
f3c7d04f5d
|
@ -35,7 +35,6 @@ from django.views.generic.detail import SingleObjectMixin
|
|||
from django.contrib.contenttypes.models import ContentType
|
||||
from django.db import transaction
|
||||
|
||||
from passerelle.base.models import ApiUser, AccessRight, BaseResource
|
||||
from passerelle.base.signature import check_query, check_url
|
||||
|
||||
|
||||
|
@ -55,6 +54,8 @@ def response_for_json(request, data):
|
|||
|
||||
|
||||
def get_request_users(request):
|
||||
from passerelle.base.models import ApiUser
|
||||
|
||||
users = []
|
||||
|
||||
users.extend(ApiUser.objects.filter(keytype=''))
|
||||
|
@ -118,6 +119,8 @@ def is_trusted(request):
|
|||
|
||||
|
||||
def is_authorized(request, obj, perm):
|
||||
from passerelle.base.models import AccessRight
|
||||
|
||||
if is_trusted(request):
|
||||
return True
|
||||
resource_type = ContentType.objects.get_for_model(obj)
|
||||
|
@ -271,6 +274,9 @@ class Request(RequestSession):
|
|||
|
||||
def export_site():
|
||||
'''Dump passerelle configuration (users, resources and ACLs) to JSON dumpable dictionnary'''
|
||||
from passerelle.base.models import ApiUser
|
||||
from passerelle.base.models import BaseResource
|
||||
|
||||
d = {}
|
||||
d['apiusers'] = [apiuser.export_json() for apiuser in ApiUser.objects.all()]
|
||||
d['resources'] = resources = []
|
||||
|
@ -289,6 +295,9 @@ def import_site(d, if_empty=False, clean=False, overwrite=False, import_users=Fa
|
|||
'''Load passerelle configuration (users, resources and ACLs) from a dictionnary loaded from
|
||||
JSON
|
||||
'''
|
||||
from passerelle.base.models import ApiUser
|
||||
from passerelle.base.models import BaseResource
|
||||
|
||||
d = d.copy()
|
||||
|
||||
def is_empty():
|
||||
|
|
Loading…
Reference in New Issue