Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@
from specifyweb.middleware.general import require_GET, require_http_methods
from specifyweb.backend.permissions.permissions import PermissionTarget, PermissionTargetAction, \
check_permission_targets, check_table_permissions
from ..specify.api import obj_to_data, toJson, \
from specifyweb.specify.api import obj_to_data, toJson, \
HttpResponseCreated, objs_to_data_, _obj_to_data
from ..specify.models import Spappresource, Spappresourcedir, Spreport, Spquery
from ..specify.views import login_maybe_required
from ..stored_queries.execution import run_ephemeral_query, models
from ..stored_queries.queryfield import QueryField
from specifyweb.specify.models import Spappresource, Spappresourcedir, Spreport, Spquery
from specifyweb.specify.views import login_maybe_required
from specifyweb.stored_queries.execution import run_ephemeral_query, models
from specifyweb.stored_queries.queryfield import QueryField


class ReportException(Exception):
Expand Down
2 changes: 1 addition & 1 deletion specifyweb/context/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

from . import views, user_resources, collection_resources
from ..backend.attachment_gw.views import get_settings as attachment_settings
from ..report_runner.views import get_status as report_runner_status
from specifyweb.backend.report_runner.views import get_status as report_runner_status

urlpatterns = [
path('login/', views.api_login),
Expand Down
2 changes: 1 addition & 1 deletion specifyweb/settings/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@ def get_sa_db_url(db_name):
'specifyweb.frontend',
'specifyweb.backend.barvis',
'specifyweb.patches',
'specifyweb.report_runner',
'specifyweb.backend.report_runner',
'specifyweb.backend.interactions',
'specifyweb.workbench',
'specifyweb.backend.notifications',
Expand Down
2 changes: 1 addition & 1 deletion specifyweb/specify/models_by_table_id.py
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ def import_model(model_name):
if model_name in model_names:
def get_model():
from importlib import import_module
if app_name in ['accounts', 'permissions', 'attachment_gw', 'barvis', 'raven_placeholder', 'notifications', 'express_search', 'hibernateboolsbackend', 'stats', 'interactions']:
if app_name in ['accounts', 'permissions', 'attachment_gw', 'barvis', 'raven_placeholder', 'notifications', 'express_search', 'hibernateboolsbackend', 'stats', 'interactions', 'report_runner']:
module = import_module(f"specifyweb.backend.{app_name}.models")
else:
module = import_module(f"specifyweb.{app_name}.models")
Expand Down
2 changes: 1 addition & 1 deletion specifyweb/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from specifyweb.backend.notifications import urls as notification_urls
from specifyweb.backend.permissions import urls as permissions_urls
from specifyweb.backend.permissions.permissions import skip_collection_access_check
from .report_runner import urls as report_urls
from specifyweb.backend.report_runner import urls as report_urls
from .specify import urls as api_urls
from .specify.views import images, properties
from .stored_queries import urls as query_urls
Expand Down