Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2024-12-18 22:57:38 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4444 from ywk253100/180320_project

Browse Source 
Return role and repository count info in GET project API
This commit is contained in:
Daniel Jiang 2018-03-21 10:24:34 +08:00 committed by GitHub
commit da41a1c1d4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -199,6 +199,8 @@ func (p *ProjectAPI) Get() {
} }
} }
p.populateProperties(p.project)
p.Data["json"] = p.project p.Data["json"] = p.project
p.ServeJSON() p.ServeJSON()
} }
@ -372,6 +374,15 @@ func (p *ProjectAPI) List() {
} }
for _, project := range result.Projects { for _, project := range result.Projects {
p.populateProperties(project)
}
p.SetPaginationHeader(result.Total, page, size)
p.Data["json"] = result.Projects
p.ServeJSON()
}
func (p *ProjectAPI) populateProperties(project *models.Project) {
if p.SecurityCtx.IsAuthenticated() { if p.SecurityCtx.IsAuthenticated() {
roles := p.SecurityCtx.GetProjectRoles(project.ProjectID) roles := p.SecurityCtx.GetProjectRoles(project.ProjectID)
if len(roles) != 0 { if len(roles) != 0 {
@ -393,11 +404,6 @@ func (p *ProjectAPI) List() {
project.RepoCount = len(repos) project.RepoCount = len(repos)
} }
p.SetPaginationHeader(result.Total, page, size)
p.Data["json"] = result.Projects
p.ServeJSON()
}
// Put ... // Put ...
func (p *ProjectAPI) Put() { func (p *ProjectAPI) Put() {
if !p.SecurityCtx.IsAuthenticated() { if !p.SecurityCtx.IsAuthenticated() {