fix all_samples_ordered

move duplicated code into a method,
handle the case of missing f1/f12 correctly

1 files changed, 6 insertions, 0 deletions

diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index acfee3d4..b17396e5 100755
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -392,6 +392,12 @@ class DatasetGroup(object):
             Redis.set(key, json.dumps(self.samplelist))
             Redis.expire(key, 60*5)
 
+    def all_samples_ordered(self):
+        result = []
+        lists = (self.parlist, self.f1list, self.samplelist)
+        [result.extend(l) for l in lists if l]
+        return result
+
     def read_genotype_file(self):
         '''Read genotype from .geno file instead of database'''
         #if self.group == 'BXD300':