Nulo/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Use correct count for NumOpenIssues (#19980)

Browse source 
- Don't specify the field in `Count` instead use `Cols` for this.
- Call `log.Error` when a error occur.

Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
This commit is contained in:
Gusted 2022-06-16 04:51:34 +02:00 committed by GitHub
parent 6473bd333a
commit 7d1770cd71
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
models/project/issue.go
View file

@ -9,6 +9,7 @@ import (
"fmt" "fmt"
"code.gitea.io/gitea/models/db" "code.gitea.io/gitea/models/db"
"code.gitea.io/gitea/modules/log"
) )
// ProjectIssue saves relation from issue to a project // ProjectIssue saves relation from issue to a project
@ -41,6 +42,7 @@ func (p *Project) NumIssues() int {
Cols("issue_id"). Cols("issue_id").
Count() Count()
if err != nil { if err != nil {
log.Error("NumIssues: %v", err)
return 0 return 0
} }
return int(c) return int(c)
@ -54,6 +56,7 @@ func (p *Project) NumClosedIssues() int {
Cols("issue_id"). Cols("issue_id").
Count() Count()
if err != nil { if err != nil {
log.Error("NumClosedIssues: %v", err)
return 0 return 0
} }
return int(c) return int(c)
@ -63,8 +66,11 @@ func (p *Project) NumClosedIssues() int {
func (p *Project) NumOpenIssues() int { func (p *Project) NumOpenIssues() int {
c, err := db.GetEngine(db.DefaultContext).Table("project_issue"). c, err := db.GetEngine(db.DefaultContext).Table("project_issue").
Join("INNER", "issue", "project_issue.issue_id=issue.id"). Join("INNER", "issue", "project_issue.issue_id=issue.id").
Where("project_issue.project_id=? AND issue.is_closed=?", p.ID, false).Count("issue.id") Where("project_issue.project_id=? AND issue.is_closed=?", p.ID, false).
Cols("issue_id").
Count()
if err != nil { if err != nil {
log.Error("NumOpenIssues: %v", err)
return 0 return 0
} }
return int(c) return int(c)