general: import get_user_from_api_query_string as needed (#6726)
Avoids circular imports (the right fix will be to move the api directory stuff out of api.py, or move get_user_from_api_query_string to another file).
This commit is contained in:
parent
18bb6483e2
commit
cfcaf94467
|
@ -54,7 +54,6 @@ import wcs.admin.workflows
|
|||
|
||||
from wcs import data_sources
|
||||
|
||||
from wcs.api import get_user_from_api_query_string
|
||||
|
||||
|
||||
try:
|
||||
|
@ -1205,6 +1204,7 @@ class FormPage(Directory):
|
|||
|
||||
def json(self):
|
||||
get_response().set_content_type('application/json')
|
||||
from wcs.api import get_user_from_api_query_string
|
||||
user = get_user_from_api_query_string() or get_request().user
|
||||
selected_filter = self.get_filter_from_query(default='all')
|
||||
criterias = self.get_criterias_from_query()
|
||||
|
|
|
@ -19,7 +19,6 @@ from quixote.directory import Directory
|
|||
from quixote.html import TemplateIO, htmltext
|
||||
|
||||
from wcs.fields import WidgetField
|
||||
from wcs.api import get_user_from_api_query_string
|
||||
|
||||
from qommon import template
|
||||
from qommon import get_logger
|
||||
|
@ -96,6 +95,7 @@ class FormStatusPage(Directory):
|
|||
session = get_session()
|
||||
mine = False
|
||||
if api_call:
|
||||
from wcs.api import get_user_from_api_query_string
|
||||
user = get_user_from_api_query_string() or get_request().user
|
||||
else:
|
||||
user = get_request().user
|
||||
|
|
|
@ -45,7 +45,6 @@ from wcs.formdef import FormDef
|
|||
from wcs.formdata import FormData
|
||||
from wcs.roles import logged_users_role
|
||||
from wcs.workflows import Workflow, EditableWorkflowStatusItem
|
||||
from wcs.api import get_user_from_api_query_string
|
||||
|
||||
from qommon.admin.texts import TextsDirectory
|
||||
|
||||
|
@ -1207,6 +1206,7 @@ class RootDirectory(AccessControlled, Directory):
|
|||
return r.getvalue()
|
||||
|
||||
def json(self):
|
||||
from wcs.api import get_user_from_api_query_string
|
||||
user = get_user_from_api_query_string() or get_request().user
|
||||
list_forms = []
|
||||
|
||||
|
@ -1293,6 +1293,7 @@ class RootDirectory(AccessControlled, Directory):
|
|||
return r.getvalue()
|
||||
|
||||
def categories_json(self):
|
||||
from wcs.api import get_user_from_api_query_string
|
||||
user = get_user_from_api_query_string() or get_request().user
|
||||
list_categories = []
|
||||
charset = get_publisher().site_charset
|
||||
|
|
Loading…
Reference in New Issue