From 28f20633db575c7844584f6dd5cf08bb4ee84656 Mon Sep 17 00:00:00 2001 From: John Davis Date: Mon, 25 Mar 2024 11:46:08 -0400 Subject: [PATCH] Refactor for readability --- lib/galaxy/model/__init__.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py index 1daa7af42dfd..b1f6f4ca123c 100644 --- a/lib/galaxy/model/__init__.py +++ b/lib/galaxy/model/__init__.py @@ -6276,11 +6276,10 @@ def attribute_columns(column_collection, attributes, nesting_level=None): q = q.outerjoin(inner_dce, inner_dce.c.dataset_collection_id == dce.c.child_collection_id) if collection_attributes: q = q.join(inner_dc, inner_dc.c.id == dce.c.child_collection_id) - q = q.add_columns(*attribute_columns(inner_dce.c, element_attributes, nesting_level)) - if collection_attributes: q = q.add_columns( *attribute_columns(inner_dc.c, collection_attributes, nesting_level), ) + q = q.add_columns(*attribute_columns(inner_dce.c, element_attributes, nesting_level)) dce = inner_dce dc = inner_dc depth_collection_type = depth_collection_type.split(":", 1)[1]