aboutsummaryrefslogtreecommitdiff
path: root/wqflask/wqflask
diff options
context:
space:
mode:
authorzsloan2021-02-23 21:43:27 +0000
committerzsloan2021-02-23 21:43:27 +0000
commitf132a7376e5ece48c03166cd9f85271d8514eecd (patch)
tree946dcbfad2bc476b4e6366b800e311eed9421c35 /wqflask/wqflask
parentb6f6c9b473802997be152e6962879175827c014d (diff)
parent4817d78b22b899b9beb3fd3a99a10d6cbcee22d6 (diff)
downloadgenenetwork2-f132a7376e5ece48c03166cd9f85271d8514eecd.tar.gz
Merge branch 'testing' of github.com:genenetwork/genenetwork2 into testing
Diffstat (limited to 'wqflask/wqflask')
-rw-r--r--wqflask/wqflask/api/gen_menu.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/wqflask/wqflask/api/gen_menu.py b/wqflask/wqflask/api/gen_menu.py
index 4ce19fdb..18afc5ad 100644
--- a/wqflask/wqflask/api/gen_menu.py
+++ b/wqflask/wqflask/api/gen_menu.py
@@ -207,7 +207,7 @@ def build_datasets(species, group, type_name):
"InbredSet.SpeciesId AND InbredSet.Name = '{1}' "
"AND ProbeSetFreeze.ProbeFreezeId = ProbeFreeze.Id "
"AND Tissue.Name = '{2}' AND ProbeFreeze.TissueId = "
- "Tissue.Id and ProbeFreeze.InbredSetId = InbredSet.Id "
+ "Tissue.Id AND ProbeFreeze.InbredSetId = InbredSet.Id "
"AND ProbeSetFreeze.public > 0 "
"ORDER BY -ProbeSetFreeze.OrderList DESC, ProbeSetFreeze.CreateTime DESC").format(species, group, type_name)).fetchall()