Merge branch 'release_24.0' into release_24.1

mvdbeek · mvdbeek · commit 9a0d482f1aa0 · 2025-05-16T16:23:36.000+02:00
diff --git a/lib/galaxy/managers/jobs.py b/lib/galaxy/managers/jobs.py
@@ -1011,7 +1011,7 @@ def inputs_recursive(input_params, param_values, depth=1, upgrade_messages=None)
                             raise Exception(
                                 f"Unhandled data input parameter type encountered {element.__class__.__name__}"
                             )
-                    rval.append(dict(text=input.label, depth=depth, value=value))
+                    rval.append(dict(text=input.label or input.name, depth=depth, value=value))
                 elif input.visible:
                     if hasattr(input, "label") and input.label:
                         label = input.label

Original file line number	Diff line number	Diff line change
`@@ -1011,7 +1011,7 @@ def inputs_recursive(input_params, param_values, depth=1, upgrade_messages=None)`
`1011`	`1011`	`raise Exception(`
`1012`	`1012`	`f"Unhandled data input parameter type encountered {element.__class__.__name__}"`
`1013`	`1013`	`)`
`1014`		`- rval.append(dict(text=input.label, depth=depth, value=value))`
	`1014`	`+ rval.append(dict(text=input.label or input.name, depth=depth, value=value))`
`1015`	`1015`	`elif input.visible:`
`1016`	`1016`	`if hasattr(input, "label") and input.label:`
`1017`	`1017`	`label = input.label`