aboutsummaryrefslogtreecommitdiff
path: root/wqflask/base
diff options
context:
space:
mode:
authorzsloan2017-02-09 16:39:06 -0600
committerGitHub2017-02-09 16:39:06 -0600
commitdab2425d6395c900b1d90ae224f039edfc560061 (patch)
tree8538f2e1d3f917da7548bbd476f97645b67fa681 /wqflask/base
parent048596e5ffb0323b0ebf3cc1a837b26b8774504e (diff)
parent2b14b0d04387a262f9895ddd87ce465c6835fa8c (diff)
downloadgenenetwork2-dab2425d6395c900b1d90ae224f039edfc560061.tar.gz
Merge pull request #247 from zsloan/master
A couple minor commits
Diffstat (limited to 'wqflask/base')
-rw-r--r--wqflask/base/data_set.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index 4b3ee4ca..54dd3c4b 100644
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -696,7 +696,7 @@ class PhenotypeDataSet(DataSet):
self.query_for_group = '''
SELECT
- InbredSet.Name, InbredSet.Id
+ InbredSet.Name, InbredSet.Id, InbredSet.GeneticType
FROM
InbredSet, PublishFreeze
WHERE
@@ -839,7 +839,7 @@ class GenotypeDataSet(DataSet):
self.query_for_group = '''
SELECT
- InbredSet.Name, InbredSet.Id
+ InbredSet.Name, InbredSet.Id, InbredSet.GeneticType
FROM
InbredSet, GenoFreeze
WHERE