diff options
| author | zsloan | 2016-08-24 19:01:20 +0000 |
|---|---|---|
| committer | zsloan | 2016-08-24 19:01:20 +0000 |
| commit | 4695840f6100d566c251eaa09498a60f6d7cfe29 (patch) | |
| tree | 486bea7fd4ef2b4a11c32cd2e7aa6c0504efe724 /wqflask/base/trait.py | |
| parent | 75b025f4cceb8c67aa487f3f8e4ef297dd6b1cbf (diff) | |
| download | genenetwork2-4695840f6100d566c251eaa09498a60f6d7cfe29.tar.gz | |
Replaced post-publication description with pre-publication description for confidential phenotype traits in search results and trait pages
Fixed table style for mapping results and interval analyst tables and added additive/dominance effect columns to the former
Fixed mapping figure X-axis to accurately label Centimorgans vs Megabases (previously it would always say Megabases)
Removed the "Sequence Site" marker from mapping result figure when mapping with genetics (centimorgans) scale
Removed some unused javascript libary imports from search/global search pages
Diffstat (limited to 'wqflask/base/trait.py')
| -rw-r--r-- | wqflask/base/trait.py | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py index f18481a8..900e050c 100644 --- a/wqflask/base/trait.py +++ b/wqflask/base/trait.py @@ -322,7 +322,7 @@ class GeneralTrait(object): #phenotype traits, then display the pre-publication description instead #of the post-publication description if self.confidential: - self.description_display = "" + self.description_display = self.pre_publication_description #if not webqtlUtil.hasAccessToConfidentialPhenotypeTrait( # privilege=self.dataset.privilege, @@ -330,11 +330,11 @@ class GeneralTrait(object): # authorized_users=self.authorized_users): # # description = self.pre_publication_description - - if description: - self.description_display = description.strip() else: - self.description_display = "" + if description: + self.description_display = description.strip() + else: + self.description_display = "" if not self.year.isdigit(): self.pubmed_text = "N/A" @@ -612,7 +612,10 @@ class GeneralTrait(object): if self.probe_target_description: formatted += "; " + self.probe_target_description elif self.dataset.type == 'Publish': - formatted = self.post_publication_description + if self.confidential: + formatted = self.pre_publication_description + else: + formatted = self.post_publication_description else: formatted = "Not available" return formatted.capitalize() |