opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-30 18:23:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: user filter by role

Browse Source
This commit is contained in:
Qiu Jian
2019-07-04 15:22:58 +08:00
parent 50e00a1bfc
commit 5980430603
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/climc/shell/users.go
+1
View File
@@ -27,6 +27,7 @@ func init() {
options.BaseListOptions
Name string `help:"Filter by name"`
OrderByDomain string `help:"order by domain name" choices:"asc|desc"`
Role string `help:"Filter by role"`
}
R(&UserListOptions{}, "user-list", "List users", func(s *mcclient.ClientSession, args *UserListOptions) error {
params, err := options.ListStructToParams(args)
pkg/keystone/models/users.go
+19 -5
View File
@@ -293,9 +293,9 @@ func (manager *SUserManager) ListItemFilter(ctx context.Context, q *sqlchemy.SQu
return nil, err
}
groupStr := jsonutils.GetAnyString(query, []string{"group_id"})
groupStr := jsonutils.GetAnyString(query, []string{"group", "group_id"})
if len(groupStr) > 0 {
groupObj, err := GroupManager.FetchById(groupStr)
groupObj, err := GroupManager.FetchByIdOrName(userCred, groupStr)
if err != nil {
if err == sql.ErrNoRows {
return nil, httperrors.NewResourceNotFoundError2(GroupManager.Keyword(), groupStr)
@@ -307,9 +307,9 @@ func (manager *SUserManager) ListItemFilter(ctx context.Context, q *sqlchemy.SQu
q = q.In("id", subq.SubQuery())
}
projectStr := jsonutils.GetAnyString(query, []string{"project_id"})
projectStr := jsonutils.GetAnyString(query, []string{"project", "project_id", "tenant", "tenant_id"})
if len(projectStr) > 0 {
project, err := ProjectManager.FetchProjectById(projectStr)
project, err := ProjectManager.FetchByIdOrName(userCred, projectStr)
if err != nil {
if err == sql.ErrNoRows {
return nil, httperrors.NewResourceNotFoundError2(ProjectManager.Keyword(), projectStr)
@@ -317,7 +317,21 @@ func (manager *SUserManager) ListItemFilter(ctx context.Context, q *sqlchemy.SQu
return nil, httperrors.NewGeneralError(err)
}
}
subq := AssignmentManager.fetchProjectUserIdsQuery(project.Id)
subq := AssignmentManager.fetchProjectUserIdsQuery(project.GetId())
q = q.In("id", subq.SubQuery())
}
roleStr := jsonutils.GetAnyString(query, []string{"role", "role_id"})
if len(roleStr) > 0 {
role, err := RoleManager.FetchByIdOrName(userCred, roleStr)
if err != nil {
if err == sql.ErrNoRows {
return nil, httperrors.NewResourceNotFoundError2(RoleManager.Keyword(), roleStr)
} else {
return nil, httperrors.NewGeneralError(err)
}
}
subq := AssignmentManager.fetchRoleUserIdsQuery(role.GetId())
q = q.In("id", subq.SubQuery())
}