From 26942b2ffde093d70863384e8c13275506ac25a7 Mon Sep 17 00:00:00 2001
From: Lei Yan
Date: Mon, 25 Aug 2014 18:36:07 +0000
Subject: Committer: Lei Yan <lei@penguin.uthsc.edu> On branch master

---
 wqflask/wqflask/correlation/show_corr_results.py | 4 ++--
 wqflask/wqflask/templates/correlation_page.html  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/correlation/show_corr_results.py b/wqflask/wqflask/correlation/show_corr_results.py
index f35fe075..ade2d242 100755
--- a/wqflask/wqflask/correlation/show_corr_results.py
+++ b/wqflask/wqflask/correlation/show_corr_results.py
@@ -187,10 +187,10 @@ class CorrelationResults(object):
                     trait_object.lit_corr = lit_corr_data[trait][1]
                 self.correlation_results.append(trait_object)
             
-            if self.corr_type != "lit" and self.dataset.type == "ProbeSet":
+            if self.corr_type != "lit" and self.dataset.type == "ProbeSet" and self.target_dataset.type == "ProbeSet":
                 self.do_lit_correlation_for_trait_list()
             
-            if self.corr_type != "tissue" and self.dataset.type == "ProbeSet":
+            if self.corr_type != "tissue" and self.dataset.type == "ProbeSet" and self.target_dataset.type == "ProbeSet":
                 self.do_tissue_correlation_for_trait_list()
             
             #print("self.correlation_results: ", pf(self.correlation_results))
diff --git a/wqflask/wqflask/templates/correlation_page.html b/wqflask/wqflask/templates/correlation_page.html
index 35b98c8e..169371be 100755
--- a/wqflask/wqflask/templates/correlation_page.html
+++ b/wqflask/wqflask/templates/correlation_page.html
@@ -83,7 +83,7 @@
                         <td><a href="/show_trait?trait_id={{trait.name}}&amp;dataset={{trait.dataset.name}}">{{ trait.name }}</a></td>
                         <td>{{ trait.symbol }}</td>
                         <td>{{ trait.description }} <br><br> <b>Aliases</b>: {{ trait.alias }}</td>
-                        <td>Chr{{ trait.chr }}: {{'%0.6f'|format(trait.mb) }}</td>
+                        <td>Chr{{ trait.chr }}: {{'%0.6f'|format(trait.mb) if trait.mb != None }}</td>
                         <td>{{'%0.3f'|format(trait.mean)}}</td>
                         <td>{{'%0.3f'|format(trait.lrs)}}</td>
                         <td>Chr{{ trait.locus_chr }}: {{'%0.3f'|format(trait.locus_mb) }}</td>
-- 
cgit v1.2.3