From 2dce5e20b5dcfa032a32a486bb4e4a4390c5f2b7 Mon Sep 17 00:00:00 2001
From: zsloan
Date: Tue, 10 Aug 2021 20:44:13 +0000
Subject: Fixed the way n_samples is calculated for the loading page and
 mapping figure; previously it would includes parents/f1s

---
 wqflask/wqflask/views.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'wqflask')

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
 
-- 
cgit v1.2.3