diff options
author | Pjotr Prins | 2016-09-09 08:35:18 +0200 |
---|---|---|
committer | Pjotr Prins | 2016-09-09 08:35:18 +0200 |
commit | 8744bf9c11481c910d029c3e6b1ae1adde27c271 (patch) | |
tree | edfab9ad67d190ef22fe2c876583a9f2380d5f86 /wqflask/wqflask/model.py | |
parent | 7cc37bf2efba6873fccd0f1756c89d25400afd47 (diff) | |
parent | ccf8474f5f94891782891bd3677e6ddf5d08d24a (diff) | |
download | genenetwork2-8744bf9c11481c910d029c3e6b1ae1adde27c271.tar.gz |
Merge branch 'master' of github.com:genenetwork/genenetwork2
Diffstat (limited to 'wqflask/wqflask/model.py')
-rw-r--r-- | wqflask/wqflask/model.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/wqflask/wqflask/model.py b/wqflask/wqflask/model.py index 3b480e0c..5321e420 100644 --- a/wqflask/wqflask/model.py +++ b/wqflask/wqflask/model.py @@ -83,7 +83,7 @@ class User(Base): def get_collection_by_name(self, collection_name): try: - collect = self.user_collections.filter_by(name=collection_name).one() + collect = self.user_collections.filter_by(name=collection_name).first() except sqlalchemy.orm.exc.NoResultFound: collect = None return collect @@ -177,12 +177,10 @@ class UserCollection(Base): except: return 0 - #@property #def display_num_members(self): # return display_collapsible(self.num_members) - def members_as_set(self): return set(json.loads(self.members)) |