aboutsummaryrefslogtreecommitdiff
path: root/wqflask
diff options
context:
space:
mode:
authorzsloan2016-02-08 17:55:27 +0000
committerzsloan2016-02-08 17:55:27 +0000
commitd6cace2f544ecd16b43f9d4054d0ae0ac8d74af5 (patch)
tree93e5f9b6f50bd4156ed8de758212232ff84934a9 /wqflask
parent7d5dba3e38892475edec80c922f06bcb40b0dcb3 (diff)
parent7705462a70d17f65bf34a158ea76f100b56582c8 (diff)
downloadgenenetwork2-d6cace2f544ecd16b43f9d4054d0ae0ac8d74af5.tar.gz
Merge branch 'master' of github.com:genenetwork/genenetwork2 into development
Conflicts: .gitignore
Diffstat (limited to 'wqflask')
-rw-r--r--wqflask/__init__.py2
-rwxr-xr-xwqflask/wqflask/templates/show_trait_calculate_correlations.html2
2 files changed, 2 insertions, 2 deletions
diff --git a/wqflask/__init__.py b/wqflask/__init__.py
new file mode 100644
index 00000000..4aa081d3
--- /dev/null
+++ b/wqflask/__init__.py
@@ -0,0 +1,2 @@
+import logging
+from wqflask import app
diff --git a/wqflask/wqflask/templates/show_trait_calculate_correlations.html b/wqflask/wqflask/templates/show_trait_calculate_correlations.html
index 68cc8b18..a7edbc48 100755
--- a/wqflask/wqflask/templates/show_trait_calculate_correlations.html
+++ b/wqflask/wqflask/templates/show_trait_calculate_correlations.html
@@ -72,7 +72,6 @@
</select>
</div>
</div>
- {% if this_trait.dataset.type == 'ProbeSet' %}
<div class="form-group">
<label class="col-xs-1 control-label">Min Expr</label>
<div class="col-xs-2 controls">
@@ -89,7 +88,6 @@
<br>
</div>
</div>
- {% endif %}
<div class="form-group">
<label class="col-xs-1 control-label">Range</label>
<div class="col-xs-3 controls">