From 6b51da8fa10d1c1b05d85daf6f3cac7b2a8db29f Mon Sep 17 00:00:00 2001
From: zsloan
Date: Thu, 21 Nov 2019 16:01:25 -0600
Subject: Use updated phenotype display IDs for all phenotypes with codes now,
 not just unpublished ones

---
 wqflask/base/trait.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'wqflask/base')

diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py
index 5fae34cf..37603873 100644
--- a/wqflask/base/trait.py
+++ b/wqflask/base/trait.py
@@ -431,6 +431,9 @@ def retrieve_trait_info(trait, dataset, get_qtl_info=False):
 
         trait.display_name = trait.name
         if dataset.type == 'Publish':
+            if trait.group_code:
+                trait.display_name = trait.group_code + "_" + str(trait.name)
+
             trait.confidential = 0
             if trait.pre_publication_description and not trait.pubmed_id:
                 trait.confidential = 1
@@ -464,9 +467,6 @@ def retrieve_trait_info(trait, dataset, get_qtl_info=False):
 
             if trait.pubmed_id:
                 trait.pubmed_link = webqtlConfig.PUBMEDLINK_URL % trait.pubmed_id
-            else:
-                if trait.group_code:
-                    trait.display_name = trait.group_code + "_" + str(trait.name)
 
         if dataset.type == 'ProbeSet' and dataset.group:
             description_string = unicode(str(trait.description).strip(codecs.BOM_UTF8), 'utf-8')
-- 
cgit v1.2.3