diff options
author | Zachary Sloan | 2013-08-13 18:23:05 -0500 |
---|---|---|
committer | Zachary Sloan | 2013-08-13 18:23:05 -0500 |
commit | 6379959af53b2ec595b85ccdc099c6f14adf0381 (patch) | |
tree | 93b73985117dfb58d41ef059834582e120dbcf59 /wqflask/wqflask | |
parent | f155e26112f088c908c0654a57a40ff1f8fe23cc (diff) | |
download | genenetwork2-6379959af53b2ec595b85ccdc099c6f14adf0381.tar.gz |
Added several test files and the file with the class that
they import (browser_test.py)
Diffstat (limited to 'wqflask/wqflask')
-rwxr-xr-x | wqflask/wqflask/show_trait/show_trait.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/wqflask/wqflask/show_trait/show_trait.py b/wqflask/wqflask/show_trait/show_trait.py index 7397c776..b0c96c56 100755 --- a/wqflask/wqflask/show_trait/show_trait.py +++ b/wqflask/wqflask/show_trait/show_trait.py @@ -1204,10 +1204,12 @@ class ShowTrait(object): other_sample_names.append(sample) if other_sample_names: - parent_f1_samples = self.dataset.group.parlist + self.dataset.group.f1list + if self.dataset.group.parlist and self.dataset.group.f1list: + parent_f1_samples = self.dataset.group.parlist + self.dataset.group.f1list other_sample_names.sort() #Sort other samples - other_sample_names = parent_f1_samples + other_sample_names + if parent_f1_samples: + other_sample_names = parent_f1_samples + other_sample_names other_samples = SampleList(dataset=self.dataset, sample_names=other_sample_names, |