Infrastructure/forgejo
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-12-24 08:06:49 -05:00
Code Issues Activity

keep sure if assigneeIDs == nil -> do nothing

Browse source
This commit is contained in:
6543 2019-11-07 18:56:50 +01:00
parent 1f90147f39
commit e72d94129c
No known key found for this signature in database
GPG key ID: A1CA74D27FD13271
2 changed files with 35 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
routers/api/v1/repo/issue.go
View file

@ -344,7 +344,7 @@ func CreateIssue(ctx *context.APIContext, form api.CreateIssueOption) {
return return
} }
// Check if the passed assignees is assignable if assigneeIDs != nil {
for _, aID := range assigneeIDs { for _, aID := range assigneeIDs {
assignee, err := models.GetUserByID(aID) assignee, err := models.GetUserByID(aID)
if err != nil { if err != nil {
@ -352,6 +352,7 @@ func CreateIssue(ctx *context.APIContext, form api.CreateIssueOption) {
return return
} }
// Check if the passed assignees is assignable
valid, err := models.CanBeAssigned(assignee, ctx.Repo.Repository, false) valid, err := models.CanBeAssigned(assignee, ctx.Repo.Repository, false)
if err != nil { if err != nil {
ctx.Error(500, "canBeAssigned", err) ctx.Error(500, "canBeAssigned", err)
@ -362,6 +363,7 @@ func CreateIssue(ctx *context.APIContext, form api.CreateIssueOption) {
return return
} }
} }
}
} else { } else {
// setting labels is not allowed if user is not a writer // setting labels is not allowed if user is not a writer
form.Labels = make([]int64, 0) form.Labels = make([]int64, 0)

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

@ -286,7 +286,8 @@ func CreatePullRequest(ctx *context.APIContext, form api.CreatePullRequestOption
} }
return return
} }
// Check if the passed assignees is assignable
if assigneeIDs != nil {
for _, aID := range assigneeIDs { for _, aID := range assigneeIDs {
assignee, err := models.GetUserByID(aID) assignee, err := models.GetUserByID(aID)
if err != nil { if err != nil {
@ -294,6 +295,7 @@ func CreatePullRequest(ctx *context.APIContext, form api.CreatePullRequestOption
return return
} }
// Check if the passed assignees is assignable
valid, err := models.CanBeAssigned(assignee, repo, true) valid, err := models.CanBeAssigned(assignee, repo, true)
if err != nil { if err != nil {
ctx.Error(500, "canBeAssigned", err) ctx.Error(500, "canBeAssigned", err)
@ -304,6 +306,7 @@ func CreatePullRequest(ctx *context.APIContext, form api.CreatePullRequestOption
return return
} }
} }
}
if err := pull_service.NewPullRequest(repo, prIssue, labelIDs, []string{}, pr, patch, assigneeIDs); err != nil { if err := pull_service.NewPullRequest(repo, prIssue, labelIDs, []string{}, pr, patch, assigneeIDs); err != nil {
if models.IsErrUserDoesNotHaveAccessToRepo(err) { if models.IsErrUserDoesNotHaveAccessToRepo(err) {