aboutsummaryrefslogtreecommitdiff
path: root/gn2/wqflask
diff options
context:
space:
mode:
authorzsloan2024-01-08 19:42:35 +0000
committerzsloan2024-01-08 20:41:33 +0000
commit737ce9ce7d413c14d69f4ccf09121210f3c3a231 (patch)
treeeba779d205ba4a530ef64d517e4ac516e084b051 /gn2/wqflask
parent0756d7b48fe7b8e9abf4485caf8938575d54185f (diff)
downloadgenenetwork2-737ce9ce7d413c14d69f4ccf09121210f3c3a231.tar.gz
Fix issue where mapmodel_rqtl and mapmethod_rqtl were still named mapmodel_rqtl_geno and mapmethod_rqtl_geno respectively
Diffstat (limited to 'gn2/wqflask')
-rw-r--r--gn2/wqflask/marker_regression/display_mapping_results.py4
-rw-r--r--gn2/wqflask/templates/mapping_results.html6
2 files changed, 5 insertions, 5 deletions
diff --git a/gn2/wqflask/marker_regression/display_mapping_results.py b/gn2/wqflask/marker_regression/display_mapping_results.py
index b3bf3bc3..4a33f1cf 100644
--- a/gn2/wqflask/marker_regression/display_mapping_results.py
+++ b/gn2/wqflask/marker_regression/display_mapping_results.py
@@ -275,8 +275,8 @@ class DisplayMappingResults:
self.mapping_method = start_vars['mapping_method']
self.mapping_results_path = start_vars['mapping_results_path']
if self.mapping_method == "rqtl_geno":
- self.mapmethod_rqtl_geno = start_vars['method']
- self.mapmodel_rqtl_geno = start_vars['model']
+ self.mapmethod_rqtl = start_vars['method']
+ self.mapmodel_rqtl = start_vars['model']
self.pair_scan = start_vars['pair_scan']
self.js_data = start_vars['js_data']
diff --git a/gn2/wqflask/templates/mapping_results.html b/gn2/wqflask/templates/mapping_results.html
index 0e084ba7..2b6a1e43 100644
--- a/gn2/wqflask/templates/mapping_results.html
+++ b/gn2/wqflask/templates/mapping_results.html
@@ -57,8 +57,8 @@
<input type="hidden" name="do_control" value="{{ doControl }}">
<input type="hidden" name="control_marker" value="{{ controlLocus }}">
<input type="hidden" name="covariates" value="{{ covariates }}">
- <input type="hidden" name="mapmethod_rqtl_geno" value="{{ mapmethod_rqtl_geno }}">
- <input type="hidden" name="mapmodel_rqtl_geno" value="{{ mapmodel_rqtl_geno }}">
+ <input type="hidden" name="mapmethod_rqtl" value="{{ mapmethod_rqtl }}">
+ <input type="hidden" name="mapmodel_rqtl" value="{{ mapmodel_rqtl }}">
<input type="hidden" name="pair_scan" value="{{ pair_scan }}">
<input type="hidden" name="transform" value="{{ transform }}">
<input type="hidden" name="tool_used" value="Mapping">
@@ -535,7 +535,7 @@
'score_type', 'suggestive', 'significant', 'num_perm', 'permCheck', 'perm_output', 'perm_strata', 'categorical_vars', 'num_bootstrap', 'bootCheck', 'bootstrap_results',
'LRSCheck', 'covariates', 'maf', 'use_loco', 'manhattan_plot', 'color_scheme', 'manhattan_single_color', 'control_marker', 'do_control', 'genofile',
'pair_scan', 'startMb', 'endMb', 'graphWidth', 'lrsMax', 'additiveCheck', 'showSNP', 'showHomology', 'showGenes', 'viewLegend', 'haplotypeAnalystCheck',
- 'mapmethod_rqtl_geno', 'mapmodel_rqtl_geno', 'temp_trait', 'group', 'species', 'reaper_version', 'primary_samples', 'n_samples']
+ 'mapmethod_rqtl', 'mapmodel_rqtl', 'temp_trait', 'group', 'species', 'reaper_version', 'primary_samples', 'n_samples']
$('input[name=wanted_inputs]').val(mapping_input_list.join(","));