Fix project filter bugs (#26490) (#26558)

Backport  #26490

related: #26012

1. missing project filter on the issue page.

https://github.com/go-gitea/gitea/blob/1e76a824bcd71acd59cdfb2c4547806bc34b3d86/modules/indexer/issues/dboptions.go#L11-L15
2. incorrect SQL condition: some issue does not belong to a project but
exists on the project_issue table.

https://github.com/go-gitea/gitea/blob/f5dbac9d36f1678b928bee04e85fbd045c725698/models/issues/issue_search.go#L233

![before](https://github.com/go-gitea/gitea/assets/50507092/1dcde39e-3e2f-4151-b2c6-4d67bf493c2f)

![after](https://github.com/go-gitea/gitea/assets/50507092/badfb81f-056d-4a2f-9838-1cba9c15768d)

diff --git a/models/issues/issue_search.go b/models/issues/issue_search.go
index 9fd13f09956aff87fe3fe78fcdae688af2f096dd..f577db69483868890e7f2013818002c0e66707f5 100644 (file)
--- a/models/issues/issue_search.go
+++ b/models/issues/issue_search.go
@@ -155,6 +155,18 @@ func applyMilestoneCondition(sess *xorm.Session, opts *IssuesOptions) *xorm.Sess
        return sess
 }
 
+func applyProjectCondition(sess *xorm.Session, opts *IssuesOptions) *xorm.Session {
+       if opts.ProjectID > 0 { // specific project
+               sess.Join("INNER", "project_issue", "issue.id = project_issue.issue_id").
+                       And("project_issue.project_id=?", opts.ProjectID)
+       } else if opts.ProjectID == db.NoConditionID { // show those that are in no project
+               sess.And(builder.NotIn("issue.id", builder.Select("issue_id").From("project_issue").And(builder.Neq{"project_id": 0})))
+       }
+       // opts.ProjectID == 0 means all projects,
+       // do not need to apply any condition
+       return sess
+}
+
 func applyRepoConditions(sess *xorm.Session, opts *IssuesOptions) *xorm.Session {
        if len(opts.RepoIDs) == 1 {
                opts.RepoCond = builder.Eq{"issue.repo_id": opts.RepoIDs[0]}
@@ -213,12 +225,7 @@ func applyConditions(sess *xorm.Session, opts *IssuesOptions) *xorm.Session {
                sess.And(builder.Lte{"issue.updated_unix": opts.UpdatedBeforeUnix})
        }
 
-       if opts.ProjectID > 0 {
-               sess.Join("INNER", "project_issue", "issue.id = project_issue.issue_id").
-                       And("project_issue.project_id=?", opts.ProjectID)
-       } else if opts.ProjectID == db.NoConditionID { // show those that are in no project
-               sess.And(builder.NotIn("issue.id", builder.Select("issue_id").From("project_issue")))
-       }
+       applyProjectCondition(sess, opts)
 
        if opts.ProjectBoardID != 0 {
                if opts.ProjectBoardID > 0 {

diff --git a/models/issues/issue_stats.go b/models/issues/issue_stats.go
index d86123a824d6d1cf358b85b8447f089fdca21d60..6c249c224416031f1a0285251ef98f773618f117 100644 (file)
--- a/models/issues/issue_stats.go
+++ b/models/issues/issue_stats.go
@@ -133,10 +133,7 @@ func getIssueStatsChunk(opts *IssuesOptions, issueIDs []int64) (*IssueStats, err
 
                applyMilestoneCondition(sess, opts)
 
-               if opts.ProjectID > 0 {
-                       sess.Join("INNER", "project_issue", "issue.id = project_issue.issue_id").
-                               And("project_issue.project_id=?", opts.ProjectID)
-               }
+               applyProjectCondition(sess, opts)
 
                if opts.AssigneeID > 0 {
                        applyAssigneeCondition(sess, opts.AssigneeID)