opendev/storyboard
Code Issues Proposed changes

Merge "Filter non-public fields when returning users in a Team"

Browse Source
This commit is contained in:
Jenkins 2016-07-18 16:18:16 +00:00 committed by Gerrit Code Review
commit 7e22fe33e5
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
storyboard/api/v1/teams.py
View File

@ -27,6 +27,7 @@ from storyboard.api.v1 import validations
from storyboard.api.v1 import wmodels
from storyboard.common import decorators
from storyboard.common import exception as exc
from storyboard.db.api import base as api_base
from storyboard.db.api import teams as teams_api
from storyboard.db.api import users as users_api
from storyboard.openstack.common.gettextutils import _ # noqas
@ -51,7 +52,9 @@ class UsersSubcontroller(rest.RestController):
if not team:
raise exc.NotFound(_("Team %s not found") % team_id)
return [wmodels.User.from_db_model(user) for user in team.users]
users = [api_base._filter_non_public_fields(user, user._public_fields)
for user in team.users]
return [wmodels.User.from_db_model(user) for user in users]
@decorators.db_exceptions
@secure(checks.superuser)
@ -65,6 +68,7 @@ class UsersSubcontroller(rest.RestController):
teams_api.team_add_user(team_id, user_id)
user = users_api.user_get(user_id)
user = api_base._filter_non_public_fields(user, user._public_fields)
return wmodels.User.from_db_model(user)