From 9769245cf3595273055d686a689cdcecb4b3645a Mon Sep 17 00:00:00 2001
From: zsloan
Date: Thu, 7 Mar 2019 17:14:56 -0600
Subject: Changed the way covariates are displayed when selected for mapping

Made the outlier notification appear for all mapping methods

Removed some misleading text saying "Block samples" from the Transform and Filter Data section
---
 wqflask/base/trait.py | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'wqflask/base')

diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py
index 9f76306f..79aa196f 100644
--- a/wqflask/base/trait.py
+++ b/wqflask/base/trait.py
@@ -220,6 +220,7 @@ def jsonable(trait):
                         dataset=dataset.name,
                         dataset_name = dataset.shortname,
                         description=trait.description_display,
+                        abbreviation=trait.abbreviation,
                         authors=trait.authors,
                         pubmed_text=trait.pubmed_text,
                         pubmed_link=trait.pubmed_link,
@@ -232,6 +233,7 @@ def jsonable(trait):
                         dataset=dataset.name,
                         dataset_name = dataset.shortname,
                         description=trait.description_display,
+                        abbreviation=trait.abbreviation,
                         authors=trait.authors,
                         pubmed_text=trait.pubmed_text,
                         lrs_score=trait.LRS_score_repr,
@@ -397,6 +399,7 @@ def retrieve_trait_info(trait, dataset, get_qtl_info=False):
             #phenotype traits, then display the pre-publication description instead
             #of the post-publication description
             if trait.confidential:
+                trait.abbreviation = trait.pre_publication_abbreviation
                 trait.description_display = trait.pre_publication_description
 
                 #if not webqtlUtil.hasAccessToConfidentialPhenotypeTrait(
@@ -406,6 +409,7 @@ def retrieve_trait_info(trait, dataset, get_qtl_info=False):
                 #
                 #    description = self.pre_publication_description
             else:
+                trait.abbreviation = trait.post_publication_abbreviation
                 if description:
                     trait.description_display = description.strip()
                 else:
-- 
cgit v1.2.3