aboutsummaryrefslogtreecommitdiff
path: root/wqflask/base/trait.py
diff options
context:
space:
mode:
authorzsloan2017-07-06 17:03:59 +0000
committerzsloan2017-07-06 17:03:59 +0000
commit97ee021da1250a63e508461b35188bc875e537e7 (patch)
tree2111574cac4f9408aa6223e10391d2a9a3f15244 /wqflask/base/trait.py
parent1364fc973518aa13643c3d604a5ccc710bd76e0d (diff)
parentd86f07f616d6892707dd26c87bf70db1a50f070a (diff)
downloadgenenetwork2-97ee021da1250a63e508461b35188bc875e537e7.tar.gz
Merge branch 'testing' of https://github.com/genenetwork/genenetwork2
Diffstat (limited to 'wqflask/base/trait.py')
-rw-r--r--wqflask/base/trait.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py
index e22a51e4..acc055d8 100644
--- a/wqflask/base/trait.py
+++ b/wqflask/base/trait.py
@@ -206,6 +206,8 @@ class GeneralTrait(object):
formatted = self.description
if self.probe_target_description:
formatted += "; " + self.probe_target_description
+ else:
+ formatted = "Not available"
elif self.dataset.type == 'Publish':
if self.confidential:
formatted = self.pre_publication_description
@@ -290,7 +292,6 @@ def retrieve_sample_data(trait, dataset, samplelist=None):
name, value, variance, num_cases, name2 = item
if not samplelist or (samplelist and name in samplelist):
trait.data[name] = webqtlCaseData(*item) #name, value, variance, num_cases)
-
return trait
def convert_location_to_value(chromosome, mb):