aboutsummaryrefslogtreecommitdiff
path: root/wqflask/wqflask/model.py
diff options
context:
space:
mode:
authorPjotr Prins2016-06-17 06:48:01 +0000
committerPjotr Prins2016-06-17 06:48:01 +0000
commit93e3878c8b97ecbf28630e4bb3733a29f4cf45aa (patch)
treeef92de7c75b7899b406e99c97006a7e2b20bd86b /wqflask/wqflask/model.py
parenteb84f7c0e384e08b810e052fd3935f6d977b7ea2 (diff)
parent10df36b60273d81678f6630c07a2d8e5a6409282 (diff)
downloadgenenetwork2-93e3878c8b97ecbf28630e4bb3733a29f4cf45aa.tar.gz
Conflict
Diffstat (limited to 'wqflask/wqflask/model.py')
-rw-r--r--[-rwxr-xr-x]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 100755..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')
-
+