Skip to content

Commit ca4806d

Browse files
wxiaoguangwxiaoguang
committed
fix
1 parent 90d20be commit ca4806d

27 files changed

+338
-316
lines changed

‎models/db/search.go

+7-5
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,10 @@ const (
2626
SearchOrderByForksReverse SearchOrderBy = "num_forks DESC"
2727
)
2828

29-
const (
30-
// Which means a condition to filter the records which don't match any id.
31-
// It's different from zero which means the condition could be ignored.
32-
NoConditionID = -1
33-
)
29+
// NoConditionID means a condition to filter the records which don't match any id.
30+
// eg: "milestone_id=-1" means "find the items without any milestone.
31+
const NoConditionID int64 = -1
32+
33+
// NonExistingID means a condition to match no result (eg: a non-existing user)
34+
// It doesn't use -1 or -2 because they are used as builtin users.
35+
const NonExistingID int64 = -1000000

‎models/issues/issue_search.go

+23-16
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ type IssuesOptions struct { //nolint
2727
RepoIDs []int64 // overwrites RepoCond if the length is not 0
2828
AllPublic bool // include also all public repositories
2929
RepoCond builder.Cond
30-
AssigneeID int64
31-
PosterID int64
30+
AssigneeID optional.Option[int64]
31+
PosterID optional.Option[int64]
3232
MentionedID int64
3333
ReviewRequestedID int64
3434
ReviewedID int64
@@ -231,15 +231,8 @@ func applyConditions(sess *xorm.Session, opts *IssuesOptions) {
231231
sess.And("issue.is_closed=?", opts.IsClosed.Value())
232232
}
233233

234-
if opts.AssigneeID > 0 {
235-
applyAssigneeCondition(sess, opts.AssigneeID)
236-
} else if opts.AssigneeID == db.NoConditionID {
237-
sess.Where("issue.id NOT IN (SELECT issue_id FROM issue_assignees)")
238-
}
239-
240-
if opts.PosterID > 0 {
241-
applyPosterCondition(sess, opts.PosterID)
242-
}
234+
applyAssigneeCondition(sess, opts.AssigneeID)
235+
applyPosterCondition(sess, opts.PosterID)
243236

244237
if opts.MentionedID > 0 {
245238
applyMentionedCondition(sess, opts.MentionedID)
@@ -359,13 +352,27 @@ func issuePullAccessibleRepoCond(repoIDstr string, userID int64, org *organizati
359352
return cond
360353
}
361354

362-
func applyAssigneeCondition(sess *xorm.Session, assigneeID int64) {
363-
sess.Join("INNER", "issue_assignees", "issue.id = issue_assignees.issue_id").
364-
And("issue_assignees.assignee_id = ?", assigneeID)
355+
func applyAssigneeCondition(sess *xorm.Session, assigneeID optional.Option[int64]) {
356+
if assigneeID == nil || assigneeID.Value() == 0 {
357+
return
358+
}
359+
if !assigneeID.Has() /* none */ || assigneeID.Value() == db.NoConditionID {
360+
// assignee is different from others, 0 also means no assignee
361+
sess.Where("issue.id NOT IN (SELECT issue_id FROM issue_assignees)")
362+
} else {
363+
sess.Join("INNER", "issue_assignees", "issue.id = issue_assignees.issue_id").
364+
And("issue_assignees.assignee_id = ?", assigneeID.Value())
365+
}
365366
}
366367

367-
func applyPosterCondition(sess *xorm.Session, posterID int64) {
368-
sess.And("issue.poster_id=?", posterID)
368+
func applyPosterCondition(sess *xorm.Session, posterID optional.Option[int64]) {
369+
if posterID == nil {
370+
return
371+
}
372+
// poster doesn't need to support db.NoConditionID(-1), so just use the value as-is
373+
if posterID.Has() {
374+
sess.And("issue.poster_id=?", posterID.Value())
375+
}
369376
}
370377

371378
func applyMentionedCondition(sess *xorm.Session, mentionedID int64) {

‎models/issues/issue_stats.go

+2-8
Original file line numberDiff line numberDiff line change
@@ -151,15 +151,9 @@ func applyIssuesOptions(sess *xorm.Session, opts *IssuesOptions, issueIDs []int6
151151

152152
applyProjectCondition(sess, opts)
153153

154-
if opts.AssigneeID > 0 {
155-
applyAssigneeCondition(sess, opts.AssigneeID)
156-
} else if opts.AssigneeID == db.NoConditionID {
157-
sess.Where("issue.id NOT IN (SELECT issue_id FROM issue_assignees)")
158-
}
154+
applyAssigneeCondition(sess, opts.AssigneeID)
159155

160-
if opts.PosterID > 0 {
161-
applyPosterCondition(sess, opts.PosterID)
162-
}
156+
applyPosterCondition(sess, opts.PosterID)
163157

164158
if opts.MentionedID > 0 {
165159
applyMentionedCondition(sess, opts.MentionedID)

‎models/issues/issue_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
repo_model "code.gitea.io/gitea/models/repo"
1717
"code.gitea.io/gitea/models/unittest"
1818
user_model "code.gitea.io/gitea/models/user"
19+
"code.gitea.io/gitea/modules/optional"
1920
"code.gitea.io/gitea/modules/setting"
2021

2122
"github.com/stretchr/testify/assert"
@@ -155,7 +156,7 @@ func TestIssues(t *testing.T) {
155156
}{
156157
{
157158
issues_model.IssuesOptions{
158-
AssigneeID: 1,
159+
AssigneeID: optional.Some(int64(1)),
159160
SortType: "oldest",
160161
},
161162
[]int64{1, 6},

‎modules/indexer/issues/db/options.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ func ToDBOptions(ctx context.Context, options *internal.SearchOptions) (*issue_m
5454
RepoIDs: options.RepoIDs,
5555
AllPublic: options.AllPublic,
5656
RepoCond: nil,
57-
AssigneeID: convertID(options.AssigneeID),
58-
PosterID: convertID(options.PosterID),
57+
AssigneeID: optional.Some(convertID(options.AssigneeID)),
58+
PosterID: options.PosterID,
5959
MentionedID: convertID(options.MentionID),
6060
ReviewRequestedID: convertID(options.ReviewRequestedID),
6161
ReviewedID: convertID(options.ReviewedID),

‎modules/indexer/issues/dboptions.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ func ToSearchOptions(keyword string, opts *issues_model.IssuesOptions) *SearchOp
4040

4141
if opts.ProjectID > 0 {
4242
searchOpt.ProjectID = optional.Some(opts.ProjectID)
43-
} else if opts.ProjectID == -1 { // FIXME: this is inconsistent from other places
43+
} else if opts.ProjectID == db.NoConditionID { // FIXME: this is inconsistent from other places
4444
searchOpt.ProjectID = optional.Some[int64](0) // Those issues with no project(projectid==0)
4545
}
4646

47-
if opts.AssigneeID > 0 {
48-
searchOpt.AssigneeID = optional.Some(opts.AssigneeID)
49-
} else if opts.AssigneeID == -1 { // FIXME: this is inconsistent from other places
50-
searchOpt.AssigneeID = optional.Some[int64](0)
47+
if opts.AssigneeID.Value() == db.NoConditionID || (opts.AssigneeID != nil && !opts.AssigneeID.Has()) {
48+
searchOpt.AssigneeID = optional.Some[int64](0) // FIXME: this is inconsistent from other places, 0 means "no assignee"
49+
} else if opts.AssigneeID.Has() && opts.AssigneeID.Value() != 0 {
50+
searchOpt.AssigneeID = opts.AssigneeID
5151
}
5252

5353
// See the comment of issues_model.SearchOptions for the reason why we need to convert
@@ -62,7 +62,7 @@ func ToSearchOptions(keyword string, opts *issues_model.IssuesOptions) *SearchOp
6262
}
6363

6464
searchOpt.ProjectColumnID = convertID(opts.ProjectColumnID)
65-
searchOpt.PosterID = convertID(opts.PosterID)
65+
searchOpt.PosterID = opts.PosterID
6666
searchOpt.MentionID = convertID(opts.MentionedID)
6767
searchOpt.ReviewedID = convertID(opts.ReviewedID)
6868
searchOpt.ReviewRequestedID = convertID(opts.ReviewRequestedID)

‎modules/indexer/issues/indexer_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ func searchIssueByID(t *testing.T) {
191191
},
192192
{
193193
// NOTE: This tests no assignees filtering and also ToSearchOptions() to ensure it will set AssigneeID to 0 when it is passed as -1.
194-
opts: *ToSearchOptions("", &issues.IssuesOptions{AssigneeID: -1}),
194+
opts: *ToSearchOptions("", &issues.IssuesOptions{AssigneeID: optional.Some(db.NoConditionID)}),
195195
expectedIDs: []int64{22, 21, 16, 15, 14, 13, 12, 11, 20, 5, 19, 18, 10, 7, 4, 9, 8, 3, 2},
196196
},
197197
{

‎routers/web/org/projects.go

+5-14
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import (
2121
"code.gitea.io/gitea/modules/setting"
2222
"code.gitea.io/gitea/modules/templates"
2323
"code.gitea.io/gitea/modules/web"
24+
"code.gitea.io/gitea/routers/web/shared/issue"
2425
shared_user "code.gitea.io/gitea/routers/web/shared/user"
2526
"code.gitea.io/gitea/services/context"
2627
"code.gitea.io/gitea/services/forms"
@@ -334,23 +335,15 @@ func ViewProject(ctx *context.Context) {
334335
return
335336
}
336337

337-
var labelIDs []int64
338-
// 1,-2 means including label 1 and excluding label 2
339-
// 0 means issues with no label
340-
// blank means labels will not be filtered for issues
341-
selectLabels := ctx.FormString("labels")
342-
if selectLabels != "" {
343-
labelIDs, err = base.StringsToInt64s(strings.Split(selectLabels, ","))
344-
if err != nil {
345-
ctx.Flash.Error(ctx.Tr("invalid_data", selectLabels), true)
346-
}
338+
labelIDs := issue.PrepareFilterIssueLabels(ctx, project.RepoID, project.Owner)
339+
if ctx.Written() {
340+
return
347341
}
348-
349342
assigneeID := ctx.FormInt64("assignee")
350343

351344
issuesMap, err := issues_model.LoadIssuesFromColumnList(ctx, columns, &issues_model.IssuesOptions{
352345
LabelIDs: labelIDs,
353-
AssigneeID: assigneeID,
346+
AssigneeID: optional.Some(assigneeID),
354347
})
355348
if err != nil {
356349
ctx.ServerError("LoadIssuesOfColumns", err)
@@ -426,8 +419,6 @@ func ViewProject(ctx *context.Context) {
426419
return
427420
}
428421
ctx.Data["Assignees"] = shared_user.MakeSelfOnTop(ctx.Doer, assigneeUsers)
429-
430-
ctx.Data["SelectLabels"] = selectLabels
431422
ctx.Data["AssigneeID"] = assigneeID
432423

433424
project.RenderedContent = templates.NewRenderUtils(ctx).MarkdownToHtml(project.Description)

0 commit comments

Comments
 (0)