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

Merge pull request #614 from ywk253100/issue591

Browse Source 
fix #591
This commit is contained in:
Daniel Jiang 2016-08-01 11:52:20 +08:00 committed by GitHub
commit 57d7636dbd
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/replication_job.go
View File

@ -134,6 +134,10 @@ func (ra *RepJobAPI) Delete() {
ra.CustomAbort(http.StatusInternalServerError, http.StatusText(http.StatusInternalServerError))
}
if job == nil {
ra.CustomAbort(http.StatusNotFound, fmt.Sprintf("job %d not found", ra.jobID))
}
if job.Status == models.JobPending || job.Status == models.JobRunning {
ra.CustomAbort(http.StatusBadRequest, fmt.Sprintf("job is %s, can not be deleted", job.Status))
}

5
api/repository.go
View File

@ -17,6 +17,7 @@ package api
import (
"encoding/json"
"fmt"
"net/http"
"os"
"sort"
@ -210,6 +211,10 @@ func (ra *RepositoryAPI) GetTags() {
ra.CustomAbort(http.StatusInternalServerError, "")
}
if project == nil {
ra.CustomAbort(http.StatusNotFound, fmt.Sprintf("project %s not found", projectName))
}
if project.Public == 0 {
userID := ra.ValidateUser()
if !checkProjectPermission(userID, project.ProjectID) {