opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release_16.04' into dev

Browse Source
This commit is contained in:
Dannon Baker
2016-05-10 11:58:11 -04:00
parent 74e6d8b5d8 d0830e0c22
commit 3ac9d2aa0a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/tools/parameters/basic.py
+1 -1
View File
@@ -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 )
lib/galaxy/web/proxy/__init__.py
+1 -1
View File
@@ -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: