From 62021ff9d59e8a906e91e4c025287efc9add2092 Mon Sep 17 00:00:00 2001
From: DannyArends
Date: Thu, 19 Mar 2015 22:59:20 +0100
Subject: try last time, something is really weird between the front and the
 backend

---
 wqflask/wqflask/marker_regression/marker_regression.py  | 4 ++--
 wqflask/wqflask/templates/show_trait_mapping_tools.html | 1 +
 wqflask/wqflask/views.py                                | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/wqflask/wqflask/marker_regression/marker_regression.py b/wqflask/wqflask/marker_regression/marker_regression.py
index 51e8e281..7e5da7cd 100755
--- a/wqflask/wqflask/marker_regression/marker_regression.py
+++ b/wqflask/wqflask/marker_regression/marker_regression.py
@@ -83,8 +83,8 @@ class MarkerRegression(object):
                 self.num_perm = start_vars['num_perm']
             self.control = start_vars['control_marker']
             print("StartVars:", start_vars)
-            self.method = start_vars['method']
-            self.model = start_vars['model']
+            self.method = start_vars['method_rqtl']
+            self.model = start_vars['model_rqtl']
 
 
             if start_vars['pair_scan'] == "true":
diff --git a/wqflask/wqflask/templates/show_trait_mapping_tools.html b/wqflask/wqflask/templates/show_trait_mapping_tools.html
index 88ff414f..9fd50b19 100755
--- a/wqflask/wqflask/templates/show_trait_mapping_tools.html
+++ b/wqflask/wqflask/templates/show_trait_mapping_tools.html
@@ -146,6 +146,7 @@
                                 {% endif %}
                             </div>
                         </div>
+
                         <div class="mapping_method_fields form-group">
                             <label style="text-align:left;" class="col-xs-12 control-label">Manhattan Plot</label>
                             <div class="col-xs-12 controls">                      
diff --git a/wqflask/wqflask/views.py b/wqflask/wqflask/views.py
index bd644bf9..204481f1 100755
--- a/wqflask/wqflask/views.py
+++ b/wqflask/wqflask/views.py
@@ -287,8 +287,8 @@ def marker_regression_page():
         'control_marker',
         'control_marker_db',
         'pair_scan'
-        'method'
-        'model'
+        'method_rqtl'
+        'model_rqtl'
     )
 
     start_vars = {}
-- 
cgit v1.2.3