From 9e8243d55cf39ba26c00903ebe75191acd075b5e Mon Sep 17 00:00:00 2001 From: John Chilton Date: Thu, 30 Jul 2020 13:38:16 -0400 Subject: [PATCH 1/3] Fix restrictOnConnections when there is a single set of options they are copied from. This is a runtime problem so these workflows were probably very broken when they tried to execute but nothing in the database or representation should need to change - making the fix somewhat clean at least. --- lib/galaxy/workflow/modules.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/workflow/modules.py b/lib/galaxy/workflow/modules.py index ebbbfd45a9c..82c82794b12 100644 --- a/lib/galaxy/workflow/modules.py +++ b/lib/galaxy/workflow/modules.py @@ -992,7 +992,7 @@ class InputParameterModule(WorkflowModule): options = None if static_options and len(static_options) == 1: # If we are connected to a single option, just use it as is so order is preserved cleanly and such. - options = [{"value": o[0], "label": o[1]} for o in static_options[0]] + options = [{"value": o[1], "label": o[0]} for o in static_options[0]] elif static_options: # Intersection based on values of multiple option connections. intxn_vals = set.intersection(*({option[1] for option in options} for options in static_options)) From 0a3c1b86a0dc84d2b97d86958aad291734a6d1ee Mon Sep 17 00:00:00 2001 From: Dannon Date: Thu, 30 Jul 2020 14:50:11 -0400 Subject: [PATCH 2/3] Update lib/galaxy/workflow/modules.py --- lib/galaxy/workflow/modules.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/workflow/modules.py b/lib/galaxy/workflow/modules.py index 82c82794b12..24b86089c40 100644 --- a/lib/galaxy/workflow/modules.py +++ b/lib/galaxy/workflow/modules.py @@ -992,7 +992,7 @@ class InputParameterModule(WorkflowModule): options = None if static_options and len(static_options) == 1: # If we are connected to a single option, just use it as is so order is preserved cleanly and such. - options = [{"value": o[1], "label": o[0]} for o in static_options[0]] + options = [{"label": o[0], "value": o[1]} for o in static_options[0]] elif static_options: # Intersection based on values of multiple option connections. intxn_vals = set.intersection(*({option[1] for option in options} for options in static_options)) From 10a456bfd4a66cbbee434214392e132c843b4309 Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Wed, 5 Aug 2020 09:41:56 -0400 Subject: [PATCH 3/3] Add missing semicolon to uwsgi_pass directive in nginx docs --- doc/source/admin/nginx.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/admin/nginx.md b/doc/source/admin/nginx.md index aeeb2e83c8f..d0af50d7cb1 100644 --- a/doc/source/admin/nginx.md +++ b/doc/source/admin/nginx.md @@ -125,7 +125,7 @@ http { # proxy all requests not matching other locations to uWSGI location / { - uwsgi_pass unix:///srv/galaxy/var/uwsgi.sock + uwsgi_pass unix:///srv/galaxy/var/uwsgi.sock; uwsgi_param UWSGI_SCHEME $scheme; include uwsgi_params; }