From cac52b6f783a1e02e9e6000ffa60dd0a1655418e Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Mon, 22 May 2023 09:27:50 +0200 Subject: [PATCH] Fix sort error when re-running job with DCE collection input Otherwise fails with ``` TypeError: '<' not supported between instances of 'NoneType' and 'int' File "galaxy/tools/__init__.py", line 2542, in populate_model tool_dict = input.to_dict(request_context, other_values=other_values) File "galaxy/tools/parameters/basic.py", line 2536, in to_dict d["options"]["hdca"] = sorted(d["options"]["hdca"], key=lambda k: k.get("hid", -1), reverse=True) ``` From https://sentry.galaxyproject.org/share/issue/1b0bcc83846b4b1891824776b0099545/ --- lib/galaxy/tools/parameters/basic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/tools/parameters/basic.py b/lib/galaxy/tools/parameters/basic.py index 8c5305be6cf..83ee4ea2135 100644 --- a/lib/galaxy/tools/parameters/basic.py +++ b/lib/galaxy/tools/parameters/basic.py @@ -2493,7 +2493,7 @@ class DataCollectionToolParameter(BaseDataToolParameter): d["options"]["hdca"].append( { "id": trans.security.encode_id(dce.id), - "hid": None, + "hid": -1, "name": dce.element_identifier, "src": "dce", "tags": [],