summaryrefslogtreecommitdiffstats
path: root/models/issue.go
diff options
context:
space:
mode:
authorLunny Xiao <xiaolunwen@gmail.com>2019-10-08 10:57:41 +0800
committerGitHub <noreply@github.com>2019-10-08 10:57:41 +0800
commit78438d310be42f9c5e0e2937ee54e6050cc8f381 (patch)
tree235c28d5bd22d38dcf70dd5d4eb8c412f66899ac /models/issue.go
parent1a269f7ef81b1a7865c4679b91a4037059ad4938 (diff)
downloadgitea-78438d310be42f9c5e0e2937ee54e6050cc8f381.tar.gz
gitea-78438d310be42f9c5e0e2937ee54e6050cc8f381.zip
Fix issues/pr list broken when there are many repositories (#8409)
* fix issues/pr list broken when there are many repositories * remove unused codes * fix counting error on issues/prs * keep the old logic * fix panic * fix tests
Diffstat (limited to 'models/issue.go')
-rw-r--r--models/issue.go54
1 files changed, 32 insertions, 22 deletions
diff --git a/models/issue.go b/models/issue.go
index e4cc1291c2..cfa6191b47 100644
--- a/models/issue.go
+++ b/models/issue.go
@@ -1306,18 +1306,19 @@ func GetIssuesByIDs(issueIDs []int64) ([]*Issue, error) {
// IssuesOptions represents options of an issue.
type IssuesOptions struct {
- RepoIDs []int64 // include all repos if empty
- AssigneeID int64
- PosterID int64
- MentionedID int64
- MilestoneID int64
- Page int
- PageSize int
- IsClosed util.OptionalBool
- IsPull util.OptionalBool
- LabelIDs []int64
- SortType string
- IssueIDs []int64
+ RepoIDs []int64 // include all repos if empty
+ RepoSubQuery *builder.Builder
+ AssigneeID int64
+ PosterID int64
+ MentionedID int64
+ MilestoneID int64
+ Page int
+ PageSize int
+ IsClosed util.OptionalBool
+ IsPull util.OptionalBool
+ LabelIDs []int64
+ SortType string
+ IssueIDs []int64
}
// sortIssuesSession sort an issues-related session based on the provided
@@ -1360,7 +1361,9 @@ func (opts *IssuesOptions) setupSession(sess *xorm.Session) {
sess.In("issue.id", opts.IssueIDs)
}
- if len(opts.RepoIDs) > 0 {
+ if opts.RepoSubQuery != nil {
+ sess.In("issue.repo_id", opts.RepoSubQuery)
+ } else if len(opts.RepoIDs) > 0 {
// In case repository IDs are provided but actually no repository has issue.
sess.In("issue.repo_id", opts.RepoIDs)
}
@@ -1627,12 +1630,12 @@ func GetIssueStats(opts *IssueStatsOptions) (*IssueStats, error) {
// UserIssueStatsOptions contains parameters accepted by GetUserIssueStats.
type UserIssueStatsOptions struct {
- UserID int64
- RepoID int64
- UserRepoIDs []int64
- FilterMode int
- IsPull bool
- IsClosed bool
+ UserID int64
+ RepoID int64
+ RepoSubQuery *builder.Builder
+ FilterMode int
+ IsPull bool
+ IsClosed bool
}
// GetUserIssueStats returns issue statistic information for dashboard by given conditions.
@@ -1646,16 +1649,23 @@ func GetUserIssueStats(opts UserIssueStatsOptions) (*IssueStats, error) {
cond = cond.And(builder.Eq{"issue.repo_id": opts.RepoID})
}
+ var repoCond = builder.NewCond()
+ if opts.RepoSubQuery != nil {
+ repoCond = builder.In("issue.repo_id", opts.RepoSubQuery)
+ } else {
+ repoCond = builder.Expr("0=1")
+ }
+
switch opts.FilterMode {
case FilterModeAll:
stats.OpenCount, err = x.Where(cond).And("is_closed = ?", false).
- And(builder.In("issue.repo_id", opts.UserRepoIDs)).
+ And(repoCond).
Count(new(Issue))
if err != nil {
return nil, err
}
stats.ClosedCount, err = x.Where(cond).And("is_closed = ?", true).
- And(builder.In("issue.repo_id", opts.UserRepoIDs)).
+ And(repoCond).
Count(new(Issue))
if err != nil {
return nil, err
@@ -1730,7 +1740,7 @@ func GetUserIssueStats(opts UserIssueStatsOptions) (*IssueStats, error) {
}
stats.YourRepositoriesCount, err = x.Where(cond).
- And(builder.In("issue.repo_id", opts.UserRepoIDs)).
+ And(repoCond).
Count(new(Issue))
if err != nil {
return nil, err