Use correct count for NumOpenIssues
(#19980)
- 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:
parent
6473bd333a
commit
7d1770cd71
1 changed files with 7 additions and 1 deletions
|
@ -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)
|
||||||
|
|
Reference in a new issue