Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix "1+n" issue in import list #3198

Merged
merged 1 commit into from
Sep 19, 2024
Merged

fix "1+n" issue in import list #3198

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion backend/geonature/core/imports/routes/imports.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

from geonature.utils.env import db
from geonature.utils.sentry import start_sentry_child
from geonature.core.gn_commons.models import TModules
from geonature.core.gn_permissions import decorators as permissions
from geonature.core.gn_permissions.decorators import login_required
from geonature.core.gn_permissions.tools import get_scopes_by_action
Expand Down Expand Up @@ -113,11 +114,12 @@ def get_import_list(scope, destination=None):
TImports.query.options(
contains_eager(TImports.dataset),
contains_eager(TImports.authors),
contains_eager(TImports.destination).load_only(Destination.label, Destination.label),
contains_eager(TImports.destination).contains_eager(Destination.module),
)
.join(TImports.dataset, isouter=True)
.join(TImports.authors, isouter=True)
.join(Destination)
.join(TModules)
.filter_by_scope(scope)
.filter(or_(*filters) if len(filters) > 0 else True)
.order_by(order_by)
Expand Down
Loading