From 01c3acf485de10fb1696fc24471751d4d3ab8e05 Mon Sep 17 00:00:00 2001
From: zsloan
Date: Mon, 22 Jun 2020 13:30:01 -0500
Subject: Fixed issue with temp traits not working for trait page functions
 like correlation or mapping

---
 wqflask/base/data_set.py                            | 3 +++
 wqflask/wqflask/static/new/javascript/show_trait.js | 3 ++-
 wqflask/wqflask/views.py                            | 5 ++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

(limited to 'wqflask')

diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index 92dc8615..2272b6ee 100644
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -65,6 +65,9 @@ logger = getLogger(__name__ )
 DS_NAME_MAP = {}
 
 def create_dataset(dataset_name, dataset_type = None, get_samplelist = True, group_name = None):
+    if dataset_name == "Temp":
+        dataset_type = "Temp"
+
     if not dataset_type:
         dataset_type = Dataset_Getter(dataset_name)
 
diff --git a/wqflask/wqflask/static/new/javascript/show_trait.js b/wqflask/wqflask/static/new/javascript/show_trait.js
index c0b2e6db..738cd536 100644
--- a/wqflask/wqflask/static/new/javascript/show_trait.js
+++ b/wqflask/wqflask/static/new/javascript/show_trait.js
@@ -515,7 +515,8 @@ $('select[name=corr_type]').change(on_corr_method_change);
 
 submit_special = function(url) {
   $("#trait_data_form").attr("action", url);
-  return $("#trait_data_form").submit();
+  $("#trait_data_form").submit();
+  return false
 };
 
 var corr_input_list = ['corr_type', 'primary_samples', 'trait_id', 'dataset', 'group', 'tool_used', 'form_url', 'corr_sample_method', 'corr_samples_group', 'corr_dataset', 'min_expr',
diff --git a/wqflask/wqflask/views.py b/wqflask/wqflask/views.py
index bc01839b..80164a22 100644
--- a/wqflask/wqflask/views.py
+++ b/wqflask/wqflask/views.py
@@ -641,7 +641,10 @@ def loading_page():
         if 'num_vals' in start_vars:
             num_vals = int(start_vars['num_vals'])
         else:
-            dataset = create_dataset(start_vars['dataset'])
+            if 'group' in start_vars:
+                dataset = create_dataset(start_vars['dataset'], group_name = start_vars['group'])
+            else:
+                dataset = create_dataset(start_vars['dataset'])
             genofile_samplelist = []
             samples = start_vars['primary_samples'].split(",")
             if 'genofile' in start_vars:
-- 
cgit v1.2.3