From 5142d0df0732faaf5983d4bb2c025a89e93f5964 Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Sat, 2 Mar 2019 16:13:47 +0100 Subject: [PATCH] Fix loading workflows with steps without default label Prior to https://github.com/galaxyproject/galaxy/pull/7422 we'd call str(default_label), so if `default_label` was None we'd get 'None'. Fixes part of https://github.com/galaxyproject/galaxy/issues/7447 --- lib/galaxy/managers/workflows.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/managers/workflows.py b/lib/galaxy/managers/workflows.py index 31348b9d6e0..ac6905758da 100644 --- a/lib/galaxy/managers/workflows.py +++ b/lib/galaxy/managers/workflows.py @@ -1012,7 +1012,7 @@ class WorkflowContentsManager(UsesAnnotations): if not module.label and module.type in ['data_input', 'data_collection_input']: new_state = safe_loads(state) default_label = new_state.get('name') - if util.unicodify(default_label).lower() not in ['input dataset', 'input dataset collection']: + if default_label and util.unicodify(default_label).lower() not in ['input dataset', 'input dataset collection']: step.label = module.label = default_label