Merge /home/lei/gene

1 files changed, 3 insertions, 6 deletions

diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index e6bd61c1..2ffa8767 100755
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -563,15 +563,12 @@ class DataSet(object):
                         """.format(*mescape(self.type, item, item, self.type, item, item))
                         
             if self.type == "Publish":
-                #query += """
-                #        WHERE {}XRef.InbredSetId = '{}'
-                #        """.format(*mescape(self.type, self.group.name))
-                
                 query += """
-                        WHERE {}XRef.InbredSetId = '{}'
+                        WHERE {}XRef.InbredSetId = {}Freeze.InbredSetId
+                        and {}Freeze.Name = '{}'
                         and {}.Id = {}XRef.{}Id
                         order by {}.Id
-                        """.format(*mescape(self.type, self.group.name, 
+                        """.format(*mescape(self.type, self.type, self.type, self.name,
                                     dataset_type, self.type, dataset_type, dataset_type))
             else:
                 query += """