fedi/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-10 17:18:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support organization labels for PRs in API (#11135)

Browse source 
Fix `/repos/{owner}/{repo}/pulls` and `/repos/{owner}/{repo}/pulls/{index}` to accept organization labels during PR creation and edition.
This commit is contained in:
CirnoT 2020-04-20 15:10:45 +02:00 committed by GitHub
parent 5bfb9bc2b6
commit d2693f18de
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
routers/api/v1/repo/pull.go
View file

@ -241,10 +241,26 @@ func CreatePullRequest(ctx *context.APIContext, form api.CreatePullRequestOption
return return
} }
labelIDs = make([]int64, len(labels)) labelIDs = make([]int64, len(form.Labels))
orgLabelIDs := make([]int64, len(form.Labels))
for i := range labels { for i := range labels {
labelIDs[i] = labels[i].ID labelIDs[i] = labels[i].ID
} }
if ctx.Repo.Owner.IsOrganization() {
orgLabels, err := models.GetLabelsInOrgByIDs(ctx.Repo.Owner.ID, form.Labels)
if err != nil {
ctx.Error(http.StatusInternalServerError, "GetLabelsInOrgByIDs", err)
return
}
for i := range orgLabels {
orgLabelIDs[i] = orgLabels[i].ID
}
}
labelIDs = append(labelIDs, orgLabelIDs...)
} }
if form.Milestone > 0 { if form.Milestone > 0 {
@ -452,6 +468,17 @@ func EditPullRequest(ctx *context.APIContext, form api.EditPullRequestOption) {
ctx.Error(http.StatusInternalServerError, "GetLabelsInRepoByIDsError", err) ctx.Error(http.StatusInternalServerError, "GetLabelsInRepoByIDsError", err)
return return
} }
if ctx.Repo.Owner.IsOrganization() {
orgLabels, err := models.GetLabelsInOrgByIDs(ctx.Repo.Owner.ID, form.Labels)
if err != nil {
ctx.Error(http.StatusInternalServerError, "GetLabelsInOrgByIDs", err)
return
}
labels = append(labels, orgLabels...)
}
if err = issue.ReplaceLabels(labels, ctx.User); err != nil { if err = issue.ReplaceLabels(labels, ctx.User); err != nil {
ctx.Error(http.StatusInternalServerError, "ReplaceLabelsError", err) ctx.Error(http.StatusInternalServerError, "ReplaceLabelsError", err)
return return