From e6c21d96f45dc74de43db451383236f28e723847 Mon Sep 17 00:00:00 2001
From: zsloan
Date: Mon, 19 Apr 2021 16:46:39 +0000
Subject: Removed unused code

---
 wqflask/base/data_set.py | 5 -----
 1 file changed, 5 deletions(-)

(limited to 'wqflask/base')

diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index 178234fe..44325d5b 100644
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -573,11 +573,6 @@ class DataSet(object):
         """Gets overridden later, at least for Temp...used by trait's get_given_name"""
         return None
 
-    # Delete this eventually
-    @property
-    def riset():
-        Weve_Renamed_This_As_Group
-
     def get_accession_id(self):
         if self.type == "Publish":
             results = g.db.execute("""select InfoFiles.GN_AccesionId from InfoFiles, PublishFreeze, InbredSet where
-- 
cgit v1.2.3


From 65a2c8c1f455c5fad48fbac1a3e75310d49ed844 Mon Sep 17 00:00:00 2001
From: zsloan
Date: Wed, 28 Apr 2021 19:45:37 +0000
Subject: Added something to jsonable in trait.py to account for temp traits
 (this is necessary for them to show up correctly when selecting traits from
 collections in pop-up windows, like when selecting cofactors for mapping)

---
 wqflask/base/trait.py | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'wqflask/base')

diff --git a/wqflask/base/trait.py b/wqflask/base/trait.py
index df96d46e..b4b4452a 100644
--- a/wqflask/base/trait.py
+++ b/wqflask/base/trait.py
@@ -337,6 +337,10 @@ def jsonable(trait):
                     dataset_name=dataset.shortname,
                     location=trait.location_repr
                     )
+    elif dataset.name == "Temp":
+        return dict(name=trait.name,
+                    dataset="Temp",
+                    dataset_name="Temp")
     else:
         return dict()
 
-- 
cgit v1.2.3