Index: ow/models/root.py
===================================================================
--- ow/models/root.py (revision 5ec3a0b5cf5640304a0953320daef2a28bbca9a5)
+++ ow/models/root.py (revision 39b14977ea6c9734e86296a94d7560ff9591a1c9)
@@ -62,10 +62,10 @@
return [u for u in self.values() if isinstance(u, User)]
- def get_user(self, user_id):
- return self.get(user_id, None)
+ def get_user(self, uid):
+ return self.get(uid, None)
- def add_user(self, user_id, **kw):
+ def add_user(self, uid, **kw):
u = User(**kw)
- self[user_id] = u
+ self[uid] = u
@property
Index: ow/schemas/user.py
===================================================================
--- ow/schemas/user.py (revision 5ec3a0b5cf5640304a0953320daef2a28bbca9a5)
+++ ow/schemas/user.py (revision 39b14977ea6c9734e86296a94d7560ff9591a1c9)
@@ -51,5 +51,5 @@
allow_extra_fields = True
filter_extra_fields = True
- user_id = validators.UnicodeString()
+ uid = validators.UnicodeString()
firstname = validators.UnicodeString()
lastname = validators.UnicodeString()
Index: ow/security.py
===================================================================
--- ow/security.py (revision 5ec3a0b5cf5640304a0953320daef2a28bbca9a5)
+++ ow/security.py (revision 39b14977ea6c9734e86296a94d7560ff9591a1c9)
@@ -1,5 +1,5 @@
-def groupfinder(user_id, request):
+def groupfinder(uid, request):
"""
Return the groups a user belongs to.
@@ -9,5 +9,5 @@
allow other users to view workouts from a given user
"""
- if user_id in request.root.all_usernames():
- return [user_id]
+ if uid in request.root.all_usernames():
+ return [uid]
return []
Index: ow/templates/add_user.pt
===================================================================
--- ow/templates/add_user.pt (revision 5ec3a0b5cf5640304a0953320daef2a28bbca9a5)
+++ ow/templates/add_user.pt (revision 39b14977ea6c9734e86296a94d7560ff9591a1c9)
@@ -22,7 +22,7 @@