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

donot add projectadmin role to sysadmin when return roles, fix #1957

Browse Source
This commit is contained in:
Wenkai Yin 2017-04-07 17:43:18 +08:00
parent afdbcc2b62
commit 746667bb38
2 changed files with 15 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ui/api/project.go
View File

@ -297,17 +297,14 @@ func (p *ProjectAPI) List() {
for i := 0; i < len(projectList); i++ { for i := 0; i < len(projectList); i++ {
if public != 1 { if public != 1 {
if isAdmin {
projectList[i].Role = models.PROJECTADMIN
} else {
roles, err := dao.GetUserProjectRoles(p.userID, projectList[i].ProjectID) roles, err := dao.GetUserProjectRoles(p.userID, projectList[i].ProjectID)
if err != nil { if err != nil {
log.Errorf("failed to get user's project role: %v", err) log.Errorf("failed to get user's project role: %v", err)
p.CustomAbort(http.StatusInternalServerError, "") p.CustomAbort(http.StatusInternalServerError, "")
} }
projectList[i].Role = roles[0].RoleID projectList[i].Role = roles[0].RoleID
} if projectList[i].Role == models.PROJECTADMIN ||
if projectList[i].Role == models.PROJECTADMIN { isAdmin {
projectList[i].Togglable = true projectList[i].Togglable = true
} }
} }

6
src/ui/api/search.go
View File

@ -78,9 +78,6 @@ func (s *SearchAPI) Get() {
} }
if userID != dao.NonExistUserID { if userID != dao.NonExistUserID {
if isSysAdmin {
p.Role = models.PROJECTADMIN
} else {
roles, err := dao.GetUserProjectRoles(userID, p.ProjectID) roles, err := dao.GetUserProjectRoles(userID, p.ProjectID)
if err != nil { if err != nil {
log.Errorf("failed to get user's project role: %v", err) log.Errorf("failed to get user's project role: %v", err)
@ -89,9 +86,8 @@ func (s *SearchAPI) Get() {
if len(roles) != 0 { if len(roles) != 0 {
p.Role = roles[0].RoleID p.Role = roles[0].RoleID
} }
}
if p.Role == models.PROJECTADMIN { if p.Role == models.PROJECTADMIN || isSysAdmin {
p.Togglable = true p.Togglable = true
} }
} }