From 37c50d076803e5afd59ebd36691a154360464a45 Mon Sep 17 00:00:00 2001 From: guerler Date: Thu, 5 May 2016 13:11:37 -0400 Subject: [PATCH 1/2] Relax default value acceptance condition --- 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 c2883bf2cba..9ab8a1d2ac6 100644 --- a/lib/galaxy/tools/parameters/basic.py +++ b/lib/galaxy/tools/parameters/basic.py @@ -1174,7 +1174,7 @@ class ColumnListParameter( SelectToolParameter ): value = ColumnListParameter._strip_c( value ) else: value = None - if not value and not self.get_legal_values( trans, other_values ) and self.accept_default: + if not value and self.accept_default: value = self.default_value or '1' return [ value ] if self.multiple else value return super( ColumnListParameter, self ).from_json( value, trans, other_values ) From 443a9e281c238121147af6192e92af80fb1eea53 Mon Sep 17 00:00:00 2001 From: Bjoern Gruening Date: Tue, 10 May 2016 13:26:52 +0200 Subject: [PATCH 2/2] fix proxy name --- lib/galaxy/web/proxy/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/galaxy/web/proxy/__init__.py b/lib/galaxy/web/proxy/__init__.py index 5fea43373a5..b35a1b09860 100644 --- a/lib/galaxy/web/proxy/__init__.py +++ b/lib/galaxy/web/proxy/__init__.py @@ -162,7 +162,7 @@ class ProxyRequests(object): def proxy_ipc(config): proxy_session_map = config.proxy_session_map - if config.dynamic_proxy == "nodejs": + if config.dynamic_proxy == "node": if proxy_session_map.endswith(".sqlite"): return SqliteProxyIpc(proxy_session_map) else: