aboutsummaryrefslogtreecommitdiff
path: root/wqflask
diff options
context:
space:
mode:
authorzsloan2021-08-10 20:44:13 +0000
committerzsloan2021-08-10 20:44:13 +0000
commit2dce5e20b5dcfa032a32a486bb4e4a4390c5f2b7 (patch)
tree2fc662bdbba75f450741a944e1dd384ae7f75943 /wqflask
parent10ef0e532324e838c7be5a0f7f451dcaec9c2ce8 (diff)
downloadgenenetwork2-2dce5e20b5dcfa032a32a486bb4e4a4390c5f2b7.tar.gz
Fixed the way n_samples is calculated for the loading page and mapping figure; previously it would includes parents/f1s
Diffstat (limited to 'wqflask')
-rw-r--r--wqflask/wqflask/views.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/wqflask/wqflask/views.py b/wqflask/wqflask/views.py
index 76fe029f..44560427 100644
--- a/wqflask/wqflask/views.py
+++ b/wqflask/wqflask/views.py
@@ -1033,7 +1033,7 @@ def loading_page():
start_vars['dataset'], group_name=start_vars['group'])
else:
dataset = create_dataset(start_vars['dataset'])
- samples = start_vars['primary_samples'].split(",")
+ samples = dataset.group.samplelist
if 'genofile' in start_vars:
if start_vars['genofile'] != "":
genofile_string = start_vars['genofile']
@@ -1178,9 +1178,8 @@ def mapping_results_page():
gn1_template_vars = display_mapping_results.DisplayMappingResults(
result).__dict__
- with Bench("Rendering template"):
- rendered_template = render_template(
- "mapping_results.html", **gn1_template_vars)
+ rendered_template = render_template(
+ "mapping_results.html", **gn1_template_vars)
return rendered_template