From 0963a02fb956a8dde0c4a3d079110ab836cdb5dd Mon Sep 17 00:00:00 2001 From: Sergey Golitsynskiy Date: Wed, 16 Mar 2022 15:05:35 -0400 Subject: [PATCH] Use class attr in load options (all_roles()) --- lib/galaxy/model/__init__.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py index 4658cd1e92c..90bafd7f52e 100644 --- a/lib/galaxy/model/__init__.py +++ b/lib/galaxy/model/__init__.py @@ -676,12 +676,12 @@ class User(Base, Dictifiable, RepresentById): db_session.query(User) .filter_by(id=self.id) # don't use get, it will use session variant. .options( - joinedload("roles"), - joinedload("roles.role"), - joinedload("groups"), - joinedload("groups.group"), - joinedload("groups.group.roles"), - joinedload("groups.group.roles.role"), + joinedload(User.roles), + joinedload(User.roles.role), + joinedload(User.groups), + joinedload(User.groups.group), + joinedload(User.groups.group.roles), + joinedload(User.groups.group.roles.role), ) .one() )