upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor synced 2024-09-21 10:58:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1943 from ywk253100/170405_member_api

Browse Source 
Return createtime and updatetime in GET members API
This commit is contained in:
Daniel Jiang 2017-04-07 11:34:44 +08:00 committed by GitHub
commit 1b2ad034a4
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) {
o := GetOrmer()
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
join project_member pm
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 ? "
queryParam = append(queryParam, "%"+escape(queryUser.Username)+"%")
}
sql += ` order by u.user_id `
sql += ` order by u.username `
_, err := o.Raw(sql, queryParam).QueryRows(&u)
return u, err
}