Quellcode durchsuchen

Support organization labels for PRs in API (#11135)

Fix `/repos/{owner}/{repo}/pulls` and `/repos/{owner}/{repo}/pulls/{index}` to accept organization labels during PR creation and edition.
tags/v1.13.0-dev
CirnoT vor 4 Jahren
Ursprung
Commit
d2693f18de
Es ist kein Account mit der E-Mail-Adresse des Committers verbunden
1 geänderte Dateien mit 28 neuen und 1 gelöschten Zeilen
  1. 28
    1
      routers/api/v1/repo/pull.go

+ 28
- 1
routers/api/v1/repo/pull.go Datei anzeigen

@@ -241,10 +241,26 @@ func CreatePullRequest(ctx *context.APIContext, form api.CreatePullRequestOption
return
}

labelIDs = make([]int64, len(labels))
labelIDs = make([]int64, len(form.Labels))
orgLabelIDs := make([]int64, len(form.Labels))

for i := range labels {
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 {
@@ -452,6 +468,17 @@ func EditPullRequest(ctx *context.APIContext, form api.EditPullRequestOption) {
ctx.Error(http.StatusInternalServerError, "GetLabelsInRepoByIDsError", err)
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 {
ctx.Error(http.StatusInternalServerError, "ReplaceLabelsError", err)
return

Laden…
Abbrechen
Speichern