fix(api): adding issue labels by name attaches both the repo and the org label (#39873)

Fixes #39651

When an org-owned repo has a repo label and an org label with the same
name, `POST`/`PUT /repos/{owner}/{repo}/issues/{index}/labels` with
label names attached both of them.

---------

Signed-off-by: Nazem <214302554+nazem-droubi@users.noreply.github.com>
Co-authored-by: Nazem <214302554+nazem-droubi@users.noreply.github.com>
Co-authored-by: silverwind <me@silverwind.io>
This commit is contained in:
authored and GitHub committed 2026-10-22 20:54:33 +00:00
1 parent 269b116b1b
commit 7448b49aac
5 files changed
+53 -5

No files matched your search

+14 -2
View File
@@ -10,6 +10,7 @@ import (
"reflect"
issues_model "gitea.dev/models/issues"
"gitea.dev/modules/container"
api "gitea.dev/modules/structs"
"gitea.dev/modules/web"
"gitea.dev/services/context"
@@ -339,12 +340,23 @@ func prepareForReplaceOrAdd(ctx *context.APIContext, form api.IssueLabelsOption)
}
labelIDs = append(labelIDs, repoLabelIDs...)
if ctx.Repo.Owner.IsOrganization() {
orgLabelIDs, err := issues_model.GetLabelIDsInOrgByNames(ctx, ctx.Repo.Owner.ID, labelNames)
repoLabels, err := issues_model.GetLabelsByIDs(ctx, repoLabelIDs, "name")
if err != nil {
ctx.APIErrorInternal(err)
return nil, nil, err
}
labelIDs = append(labelIDs, orgLabelIDs...)
orgLabelNames := container.SetOf(labelNames...)
for _, label := range repoLabels {
orgLabelNames.Remove(label.Name)
}
if len(orgLabelNames) > 0 {
orgLabelIDs, err := issues_model.GetLabelIDsInOrgByNames(ctx, ctx.Repo.Owner.ID, orgLabelNames.Values())
if err != nil {
ctx.APIErrorInternal(err)
return nil, nil, err
}
labelIDs = append(labelIDs, orgLabelIDs...)
}
}
}