Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-11-23 02:35:17 +01:00
Code Issues Projects Releases Wiki Activity

return createtime and updatetime, fix #1924

Browse Source
This commit is contained in:
Wenkai Yin 2017-04-06 18:18:15 +08:00
parent b7a196f7aa
commit 3b56893f3c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common/dao/projectmember.go
View File

@ -58,7 +58,8 @@ func DeleteProjectMember(projectID int64, userID int) error {
func GetUserByProject(projectID int64, queryUser models.User) ([]models.User, error) { func GetUserByProject(projectID int64, queryUser models.User) ([]models.User, error) {
o := GetOrmer() o := GetOrmer()
u := []models.User{} u := []models.User{}
sql := `select u.user_id, u.username, r.name rolename, r.role_id as role sql := `select u.user_id, u.username, u.creation_time, u.update_time, r.name as rolename,
r.role_id as role
from user u from user u
join project_member pm join project_member pm
on pm.project_id = ? and u.user_id = pm.user_id on pm.project_id = ? and u.user_id = pm.user_id
@ -73,7 +74,7 @@ func GetUserByProject(projectID int64, queryUser models.User) ([]models.User, er
sql += " and u.username like ? " sql += " and u.username like ? "
queryParam = append(queryParam, "%"+escape(queryUser.Username)+"%") queryParam = append(queryParam, "%"+escape(queryUser.Username)+"%")
} }
sql += ` order by u.user_id ` sql += ` order by u.username `
_, err := o.Raw(sql, queryParam).QueryRows(&u) _, err := o.Raw(sql, queryParam).QueryRows(&u)
return u, err return u, err
} }