From 03ff54d76a7ab2ed028d68cb623facea314366ae Mon Sep 17 00:00:00 2001
From: DannyArends
Date: Thu, 19 Mar 2015 23:01:38 +0100
Subject: Name method is already taken

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

diff --git a/wqflask/wqflask/marker_regression/marker_regression.py b/wqflask/wqflask/marker_regression/marker_regression.py
index 7e5da7cd..d57070f8 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_rqtl']
-            self.model = start_vars['model_rqtl']
+            self.method = start_vars['mapmethod_rqtl']
+            self.model = start_vars['mapmodel_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 9fd50b19..7a9a2c90 100755
--- a/wqflask/wqflask/templates/show_trait_mapping_tools.html
+++ b/wqflask/wqflask/templates/show_trait_mapping_tools.html
@@ -163,7 +163,7 @@
 
                         <div class="mapping_method_fields form-group">
                             <label style="text-align:left;" class="col-xs-12 control-label">Method</label>
-                            <select name="method_rqtl">
+                            <select name="mapmethod_rqtl">
                               <option value="em">em</option>
                               <option value="imp">imp</option>
                               <option value="hk">hk</option>
@@ -176,7 +176,7 @@
 
                         <div class="mapping_method_fields form-group">
                             <label style="text-align:left;" class="col-xs-12 control-label">Model</label>
-                            <select name="model_rqtl">
+                            <select name="mapmodel_rqtl">
                               <option value="normal">normal</option>
                               <option value="binary">binary</option>
                               <option value="2part">2part</option>
diff --git a/wqflask/wqflask/views.py b/wqflask/wqflask/views.py
index 204481f1..8f3c21fc 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_rqtl'
-        'model_rqtl'
+        'mapmethod_rqtl'
+        'mapmodel_rqtl'
     )
 
     start_vars = {}
-- 
cgit v1.2.3