aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPjotr Prins2016-10-31 21:03:42 +0000
committerPjotr Prins2016-10-31 21:03:42 +0000
commit9b27928ff72f48fc2b9144b6aa1e12cf97afadd3 (patch)
tree6357c2561214791c105ef6afc07a62bdfc9fd41f
parent7e6fcdeab53edf0e84189e0c18cdb0ce6dd6a41c (diff)
parentb1a255c0990641fb4b4b8682eae3589bf0d3abb3 (diff)
downloadgenenetwork2-9b27928ff72f48fc2b9144b6aa1e12cf97afadd3.tar.gz
Merge branch 'lyan' into testing
-rw-r--r--wqflask/wqflask/show_trait/show_trait.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/wqflask/wqflask/show_trait/show_trait.py b/wqflask/wqflask/show_trait/show_trait.py
index 9a695d8e..8aff5482 100644
--- a/wqflask/wqflask/show_trait/show_trait.py
+++ b/wqflask/wqflask/show_trait/show_trait.py
@@ -1265,7 +1265,7 @@ def get_nearest_marker(this_trait, this_db):
#return result[0][0], result[1][0]
def get_genofiles(this_trait):
- jsonfile = "%s/%s.json" % (get_setting('GENOFILE_META'), this_trait.dataset.group.name)
+ jsonfile = "%s/%s.json" % (webqtlConfig.GENODIR, this_trait.dataset.group.name)
try:
f = open(jsonfile)
except: