Fix 2 more cases of using strings to indicate load options

galaxyproject · Dec 11, 2023 · 4664534 · 4664534
1 parent ebbd7c3
commit 4664534
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/lib/galaxy/webapps/galaxy/controllers/history.py b/lib/galaxy/webapps/galaxy/controllers/history.py
@@ -116,7 +116,7 @@ def sort(self, trans, query, ascending, column_name=None):
     def build_initial_query(self, trans, **kwargs):
         # Override to preload sharing information used when fetching data for grid.
         query = super().build_initial_query(trans, **kwargs)
-        query = query.options(undefer(History.users_shared_with_count))
+        query = query.options(undefer(self.model_class.users_shared_with_count))
         return query
 
     # Grid definition

diff --git a/lib/galaxy/webapps/galaxy/controllers/page.py b/lib/galaxy/webapps/galaxy/controllers/page.py
@@ -168,9 +168,9 @@ def build_initial_query(self, trans, **kwargs):
             .join("user")
             .filter(model.User.deleted == false())
             .options(
-                joinedload(self.model_class.user).load_only("username"),
+                joinedload(self.model_class.user).load_only(self.model_class.username),
                 joinedload(self.model_class.annotations),
-                undefer("average_rating"),
+                undefer(self.model_class.average_rating),
             )
         )