aboutsummaryrefslogtreecommitdiff
path: root/wqflask
diff options
context:
space:
mode:
authorzsloan2018-02-14 16:54:44 +0000
committerzsloan2018-02-14 16:54:44 +0000
commit3e8f182b3478590c13046a2892480156315683eb (patch)
treece7ace6ef52691304d16b0fecc05ddcc52de7e07 /wqflask
parent85b8ecc3d6cb44a7a45e942c4ff353add54be7fa (diff)
downloadgenenetwork2-3e8f182b3478590c13046a2892480156315683eb.tar.gz
Added empty collection error page to git, since it wasn't on production
Diffstat (limited to 'wqflask')
-rw-r--r--wqflask/wqflask/correlation/show_corr_results.py17
-rw-r--r--wqflask/wqflask/templates/empty_collection.html15
2 files changed, 15 insertions, 17 deletions
diff --git a/wqflask/wqflask/correlation/show_corr_results.py b/wqflask/wqflask/correlation/show_corr_results.py
index c072cf82..4d7fea61 100644
--- a/wqflask/wqflask/correlation/show_corr_results.py
+++ b/wqflask/wqflask/correlation/show_corr_results.py
@@ -167,26 +167,9 @@ class CorrelationResults(object):
self.sample_data = {}
self.corr_type = start_vars['corr_type']
self.corr_method = start_vars['corr_sample_method']
-<<<<<<< HEAD
- if 'min_expr' in start_vars:
- if start_vars['min_expr'] != "":
- self.min_expr = float(start_vars['min_expr'])
- else:
- self.min_expr = None
- logger.debug("P RANGE:", start_vars['p_range_lower'])
- try:
- self.p_range_lower = float(start_vars['p_range_lower'])
- except:
- self.p_range_lower = -1.00
- try:
- self.p_range_upper = float(start_vars['p_range_upper'])
- except:
- self.p_range_upper = 1.00
-=======
self.min_expr = get_float(start_vars,'min_expr')
self.p_range_lower = get_float(start_vars,'p_range_lower',-1.0)
self.p_range_upper = get_float(start_vars,'p_range_upper',1.0)
->>>>>>> f44a18ccd4c45ab7fd2179c9000d1bf836e3f654
if ('loc_chr' in start_vars and
'min_loc_mb' in start_vars and
diff --git a/wqflask/wqflask/templates/empty_collection.html b/wqflask/wqflask/templates/empty_collection.html
new file mode 100644
index 00000000..3f2b3786
--- /dev/null
+++ b/wqflask/wqflask/templates/empty_collection.html
@@ -0,0 +1,15 @@
+{% extends "base.html" %}
+{% block title %}{{ tool }}{% endblock %}
+{% block content %}
+<!-- Start of body -->
+ {{ header("Error") }}
+
+ <div class="container">
+ <input type="hidden" name="uc_id" id="uc_id" value="{{ uc_id }}">
+ <p>You must select at least one trait to use the {{ tool }}.</p>
+ </div>
+
+
+<!-- End of body -->
+
+{% endblock %}