aboutsummaryrefslogtreecommitdiff
path: root/wqflask/base
diff options
context:
space:
mode:
authorAlexander Kabui2020-11-27 16:11:06 +0300
committerAlexander Kabui2020-11-27 16:11:06 +0300
commit8485dfd5aa02f451a646f643f503ccb02779430b (patch)
tree1df6291f98a6be1939a908271f45a6f54639f7b7 /wqflask/base
parent77dff447c83a4b0824fe6626d16484cfd826ca77 (diff)
parent39accba7e31beb6f0df5ddb96fb3062d527b12af (diff)
downloadgenenetwork2-8485dfd5aa02f451a646f643f503ccb02779430b.tar.gz
Merge branch 'testing' of https://github.com/genenetwork/genenetwork2 into test-regression
Diffstat (limited to 'wqflask/base')
-rw-r--r--wqflask/base/trait.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py
index cfc02f8b..0f8f937c 100644
--- a/wqflask/base/trait.py
+++ b/wqflask/base/trait.py
@@ -265,14 +265,17 @@ def get_sample_data():
trait_dict['species'] = trait_ob.dataset.group.species
trait_dict['url'] = url_for(
'show_trait_page', trait_id=trait, dataset=dataset)
- trait_dict['description'] = trait_ob.description_display
if trait_ob.dataset.type == "ProbeSet":
trait_dict['symbol'] = trait_ob.symbol
trait_dict['location'] = trait_ob.location_repr
+ trait_dict['description'] = trait_ob.description_display
elif trait_ob.dataset.type == "Publish":
+ trait_dict['description'] = trait_ob.description_display
if trait_ob.pubmed_id:
trait_dict['pubmed_link'] = trait_ob.pubmed_link
trait_dict['pubmed_text'] = trait_ob.pubmed_text
+ else:
+ trait_dict['location'] = trait_ob.location_repr
return json.dumps([trait_dict, {key: value.value for
key, value in list(