Skip to content

Commit 84203b0

Browse files
committed
simplify
1 parent 2d8a320 commit 84203b0

File tree

1 file changed

+14
-16
lines changed

1 file changed

+14
-16
lines changed

models/issue_assignees.go

+14-16
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
package models
66

77
import (
8+
"code.gitea.io/gitea/modules/util"
89
"fmt"
910

1011
"xorm.io/xorm"
@@ -173,24 +174,21 @@ func MakeIDsFromAPIAssigneesToAdd(oneAssignee string, multipleAssignees []string
173174

174175
var requestAssignees []string
175176

176-
// Prevent double adding assignees and empty assignees
177-
var isDouble bool
178-
for _, assignee := range multipleAssignees {
179-
// Keeping the old assigning method for compatibility reasons
180-
if assignee == oneAssignee {
181-
isDouble = true
182-
continue
183-
}
184-
185-
//if assignee is empty skip
186-
if assignee == "" {
187-
continue
188-
}
189-
requestAssignees = append(requestAssignees, assignee)
177+
// Keeping the old assigning method for compatibility reasons
178+
if !util.ExistsInSlice(oneAssignee, multipleAssignees) {
179+
requestAssignees = append(requestAssignees, oneAssignee)
190180
}
191181

192-
if !isDouble {
193-
requestAssignees = append(requestAssignees, oneAssignee)
182+
//Prevent empty assignerees
183+
if util.ExistsInSlice("", multipleAssignees) {
184+
for _, assignee := range multipleAssignees {
185+
if assignee == "" {
186+
continue
187+
}
188+
requestAssignees = append(requestAssignees, assignee)
189+
}
190+
} else {
191+
requestAssignees = append(requestAssignees, multipleAssignees...)
194192
}
195193

196194
if len(requestAssignees) > 0 {

0 commit comments

Comments
 (0)