aboutsummaryrefslogtreecommitdiff
path: root/wqflask/wqflask/model.py
diff options
context:
space:
mode:
authorzsloan2016-06-20 16:01:12 +0000
committerzsloan2016-06-20 16:01:12 +0000
commit30a37c6f1f9a9f759a92fd61876af9e9e3d078b9 (patch)
treee4f5b49aa21c32aa2b770b1a65c8fef7782b625f /wqflask/wqflask/model.py
parent4fec0e6fc0772785a30451d417082bc189f2f6dd (diff)
parent10df36b60273d81678f6630c07a2d8e5a6409282 (diff)
downloadgenenetwork2-30a37c6f1f9a9f759a92fd61876af9e9e3d078b9.tar.gz
Merge branch 'staging' of github.com:genenetwork/genenetwork2 into development
Diffstat (limited to 'wqflask/wqflask/model.py')
-rw-r--r--wqflask/wqflask/model.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/wqflask/wqflask/model.py b/wqflask/wqflask/model.py
index 5ea32e1f..3b480e0c 100644
--- a/wqflask/wqflask/model.py
+++ b/wqflask/wqflask/model.py
@@ -176,7 +176,7 @@ class UserCollection(Base):
return len(json.loads(self.members))
except:
return 0
-
+
#@property
#def display_num_members(self):
@@ -197,4 +197,4 @@ def display_collapsible(number):
def user_uuid():
"""Unique cookie for a user"""
user_uuid = request.cookies.get('user_uuid')
-
+