aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorzsloan2015-12-18 21:50:01 +0000
committerzsloan2015-12-18 21:50:01 +0000
commit25ef0d84ef7db9a24d5b198a302eca1c57ccafb1 (patch)
tree274f5edd38c1e965e0f3eb09d9a13f26e068fef1
parent1e85fcb296361208b5b9883c4d9860b8296efc28 (diff)
downloadgenenetwork2-25ef0d84ef7db9a24d5b198a302eca1c57ccafb1.tar.gz
Mapping results open in new window; still need to add header/footer/js
-rwxr-xr-xwqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js9
-rwxr-xr-xwqflask/wqflask/templates/show_trait.html2
2 files changed, 6 insertions, 5 deletions
diff --git a/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js b/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js
index 2f26d6cb..3834e60b 100755
--- a/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js
+++ b/wqflask/wqflask/static/new/javascript/show_trait_mapping_tools.js
@@ -2,12 +2,12 @@
(function() {
var block_outliers, composite_mapping_fields, do_ajax_post, get_progress, mapping_method_fields, open_mapping_results, outlier_text, showalert, submit_special, toggle_enable_disable, update_time_remaining;
- submit_special = function() {
- var url;
+ submit_special = function(url) {
+ //var url;
console.log("In submit_special");
console.log("this is:", this);
console.log("$(this) is:", $(this));
- url = $(this).data("url");
+ //url = $(this).data("url");
console.log("url is:", url);
$("#trait_data_form").attr("action", url);
return $("#trait_data_form").submit();
@@ -172,7 +172,8 @@
$('input[name=manhattan_plot]').val($('input[name=manhattan_plot_pylmm]:checked').val());
form_data = $('#trait_data_form').serialize();
console.log("form_data is:", form_data);
- return do_ajax_post(url, form_data);
+ return submit_special(url);
+ //return do_ajax_post(url, form_data);
};
})(this));
diff --git a/wqflask/wqflask/templates/show_trait.html b/wqflask/wqflask/templates/show_trait.html
index a86a149d..c2b59c02 100755
--- a/wqflask/wqflask/templates/show_trait.html
+++ b/wqflask/wqflask/templates/show_trait.html
@@ -27,7 +27,7 @@
{% endif %}
- <form method="post" action="/corr_compute" name="trait_page" id="trait_data_form"
+ <form method="post" target="_blank" action="/corr_compute" name="trait_page" id="trait_data_form"
class="form-horizontal">
<div id="hidden_inputs">
<input type="hidden" name="trait_hmac" value="{{ data_hmac('{}:{}'.format(this_trait.name, dataset.name)) }}">