Skip to content

Commit

Permalink
fix: due to wrong rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
Maxime Vergez committed Jan 13, 2023
1 parent 4008de1 commit 1b958ac
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 5 deletions.
6 changes: 2 additions & 4 deletions backend/gn_module_monitoring/modules/repositories.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
get_modules
"""

from sqlalchemy.orm import Load, joinedload
from sqlalchemy.orm import Load
from sqlalchemy.orm.exc import MultipleResultsFound, NoResultFound

from geonature.utils.env import DB
Expand Down Expand Up @@ -93,9 +93,7 @@ def get_modules():
# Raise load not to load any other thing than
# medias and categories
# datasets are not required
Load(TMonitoringModules).raiseload("*"),
joinedload("medias"),
joinedload("categories"),
Load(TMonitoringModules).raiseload("*")
)
.order_by(TMonitoringModules.module_label)
.all()
Expand Down
2 changes: 1 addition & 1 deletion backend/gn_module_monitoring/routes/data_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -244,4 +244,4 @@ def get_util_from_ids_api(type_util, ids):
return [r.as_dict() for r in res]

# renvoie une chaine de caratère
return separator_out.join([r[0] for r in res])
return separator_out.join([r[0] for r in res])

0 comments on commit 1b958ac

Please sign in to comment.