Changeset 39b1497 in OpenWorkouts-current

Timestamp:

Dec 14, 2018, 12:57:33 PM (5 years ago)

Author:

borja <borja@…>

Branches:

current, feature/docs, master

Children:

929097a

Parents:

5ec3a0b

Message:

Replaced user_id leftovers with uid

Location:

ow

Files:

• models/root.py (modified) (1 diff)
• schemas/user.py (modified) (1 diff)
• security.py (modified) (2 diffs)
• templates/add_user.pt (modified) (1 diff)
• templates/profile.pt (modified) (1 diff)
• templates/user_list.pt (modified) (1 diff)
• tests/models/test_root.py (modified) (3 diffs)
• tests/views/test_root.py (modified) (1 diff)
• views/root.py (modified) (1 diff)

ow/models/root.py

@@ -62 +62 @@
         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

ow/schemas/user.py

@@ -51 +51 @@
     allow_extra_fields = True
     filter_extra_fields = True
-    user_id = validators.UnicodeString()
+    uid = validators.UnicodeString()
     firstname = validators.UnicodeString()
     lastname = validators.UnicodeString()

ow/security.py

@@ -1 +1 @@
 
 
-def groupfinder(user_id, request):
+def groupfinder(uid, request):
     """
     Return the groups a user belongs to.
@@ -9 +9 @@
     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 []

ow/templates/add_user.pt

@@ -22 +22 @@
 
       <fieldset>
-        ${form.errorlist('user_id')}
+        ${form.errorlist('uid')}
         <label for="email" i18n:translate="">User ID:</label>
-        ${form.text('user_id')}
+        ${form.text('uid')}
         ${form.errorlist('email')}
         <label for="email" i18n:translate="">E-Mail:</label>

ow/templates/profile.pt

@@ -21 +21 @@
       <h2>
         <tal:fullname tal:content="context.fullname"></tal:fullname>
-        (<tal:user_id tal:content="context.user_id"></tal:user_id>)
+        (<tal:uid tal:content="context.uid"></tal:uid>)
       </h2>
       <h3>

ow/templates/user_list.pt

@@ -26 +26 @@
       </thead>
       <tal:r tal:repeat="user users">
-      <tr tal:attributes="id 'user-' + user.user_id">
+      <tr tal:attributes="id 'user-' + str(user.uid)">
         <td>${user.fullname}</td>
         <td>${user.email}</td>

ow/tests/models/test_root.py

@@ -30 +30 @@
 
     def test_lowercase_usernames(self, root):
-        root.add_user(user_id='Jack', firstname='Jack', lastname='Dumb',
+        root.add_user(uid='Jack', firstname='Jack', lastname='Dumb',
                       email='jack.dumb@example.net')
         assert root.lowercase_usernames() == ['jack', 'john']
@@ -38 +38 @@
 
     def test_lowercase_emails(self, root):
-        root.add_user(user_id='Jack', firstname='Jack', lastname='Dumb',
+        root.add_user(uid='Jack', firstname='Jack', lastname='Dumb',
                       email='Jack.Dumb@example.net')
         assert root.lowercase_emails() == ['jack.dumb@example.net',
@@ -55 +55 @@
     def test_add_user(self, root):
         assert len(root.users()) == 1
-        root.add_user(user_id='jack', firstname='Jack', lastname='Dumb',
+        root.add_user(uid='jack', firstname='Jack', lastname='Dumb',
                       email='jack.dumb@example.net')
         assert len(root.users()) == 2

ow/tests/views/test_root.py

@@ -73 +73 @@
     def test_add_user_post_valid(self, post_request):
         request = post_request
-        request.POST['user_id'] = 'addeduser'
+        request.POST['uid'] = 'addeduser'
         request.POST['email'] = 'addeduser@example.net'
         request.POST['firstname'] = 'added'

ow/views/root.py

@@ -34 +34 @@
 
     if 'submit' in request.POST and form.validate():
-        user_id = request.POST['user_id']
-        user = form.bind(User(), exclude=['user_id'])
-        context[user_id] = user
+        uid = request.POST['uid']
+        user = form.bind(User(), exclude=['uid'])
+        context[uid] = user
         return HTTPFound(location=request.resource_url(context, 'userlist'))