Merge /home/zas1024/gene

Conflicts:
	wqflask/wqflask/static/new/javascript/dataset_select_menu.js
	wqflask/wqflask/templates/corr_scatter_plot_old.html

1 files changed, 14 insertions, 6 deletions

diff --git a/web/webqtl/showTrait/DataEditingPage.py b/web/webqtl/showTrait/DataEditingPage.py
index c240d8a0..20231429 100755
--- a/web/webqtl/showTrait/DataEditingPage.py
+++ b/web/webqtl/showTrait/DataEditingPage.py
@@ -1552,13 +1552,21 @@ class DataEditingPage(templatePage):
 		attribute_ids = []
 		attribute_names = []
 		try:
+			
+			if thisTrait.db.type=='ProbeSet':
 			#ZS: Id values for this trait's extra attributes; used to create "Exclude" dropdown and query for attribute values and create
-			self.cursor.execute("""SELECT CaseAttribute.Id, CaseAttribute.Name
-                                			FROM CaseAttribute, CaseAttributeXRef
-                                          	WHERE CaseAttributeXRef.ProbeSetFreezeId = '%s' AND
-                                          		CaseAttribute.Id = CaseAttributeXRef.CaseAttributeId
-                                                 	group by CaseAttributeXRef.CaseAttributeId""" % (str(thisTrait.db.id)))
-
+				self.cursor.execute("""SELECT CaseAttribute.Id, CaseAttribute.Name
+												FROM CaseAttribute, CaseAttributeXRef
+												WHERE CaseAttributeXRef.ProbeSetFreezeId = '%s' AND
+													CaseAttribute.Id = CaseAttributeXRef.CaseAttributeId
+														group by CaseAttributeXRef.CaseAttributeId""" % (str(thisTrait.db.id)))
+			elif thisTrait.db.type=='Publish':
+				self.cursor.execute("""SELECT CaseAttribute.Id, CaseAttribute.Name
+												FROM CaseAttribute, CaseAttributeXRef
+												WHERE CaseAttributeXRef.PublishFreezeId = '%s' AND
+													CaseAttribute.Id = CaseAttributeXRef.CaseAttributeId
+														group by CaseAttributeXRef.CaseAttributeId""" % (str(thisTrait.db.id)))
+				
 			exclude_menu = HT.Select(name="exclude_menu")
 			dropdown_menus = [] #ZS: list of dropdown menus with the distinct values of each attribute (contained in DIVs so the style parameter can be edited and they can be hidden)