Upstream/harbor
1
0
Fork 0
mirror of https://github.com/goharbor/harbor.git synced 2025-02-01 20:41:22 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #4059 from ywk253100/180117_job_status

Browse Source 
Support multiple status in query string of replication job listing API
This commit is contained in:
Wenkai Yin 2018-01-18 18:05:08 +08:00 committed by GitHub
commit 69fa18c881
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/ui/api/replication_job.go
View File

@ -82,7 +82,7 @@ func (ra *RepJobAPI) List() {
}
repository := ra.GetString("repository")
status := ra.GetString("status")
statuses := ra.GetStrings("status")
var startTime *time.Time
startTimeStr := ra.GetString("start_time")
@ -108,15 +108,11 @@ func (ra *RepJobAPI) List() {
page, pageSize := ra.GetPaginationParams()
statuses := []string{}
if len(status) > 0 {
statuses = append(statuses, status)
}
jobs, total, err := dao.FilterRepJobs(policyID, repository, statuses,
startTime, endTime, pageSize, pageSize*(page-1))
if err != nil {
log.Errorf("failed to filter jobs according policy ID %d, repository %s, status %s, start time %v, end time %v: %v",
policyID, repository, status, startTime, endTime, err)
log.Errorf("failed to filter jobs according policy ID %d, repository %s, status %v, start time %v, end time %v: %v",
policyID, repository, statuses, startTime, endTime, err)
ra.CustomAbort(http.StatusInternalServerError, "")
}