diff options
| author | Lunny Xiao <xiaolunwen@gmail.com> | 2024-12-27 20:04:07 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-12-28 04:04:07 +0000 |
| commit | e69da2cd07da8637d8fa5802b78882598a545299 (patch) | |
| tree | 4930fbc8f30e455e97d2ffbea2c5b428f8f928e2 | |
| parent | e435b1900a00dd98d65aa1f7668fe41e4df83044 (diff) | |
| download | gitea-e69da2cd07da8637d8fa5802b78882598a545299.tar.gz gitea-e69da2cd07da8637d8fa5802b78882598a545299.zip | |
Fix bug on activities (#33008)
A repository with no issue will display a random number on activities
page. This is caused by wrong usage of `And` and `Or`.
| -rw-r--r-- | models/activities/repo_activity.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/models/activities/repo_activity.go b/models/activities/repo_activity.go index 3ffad035b7..3ccdbd47d3 100644 --- a/models/activities/repo_activity.go +++ b/models/activities/repo_activity.go @@ -16,6 +16,7 @@ import ( "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/gitrepo" + "xorm.io/builder" "xorm.io/xorm" ) @@ -337,8 +338,10 @@ func newlyCreatedIssues(ctx context.Context, repoID int64, fromTime time.Time) * func activeIssues(ctx context.Context, repoID int64, fromTime time.Time) *xorm.Session { sess := db.GetEngine(ctx).Where("issue.repo_id = ?", repoID). And("issue.is_pull = ?", false). - And("issue.created_unix >= ?", fromTime.Unix()). - Or("issue.closed_unix >= ?", fromTime.Unix()) + And(builder.Or( + builder.Gte{"issue.created_unix": fromTime.Unix()}, + builder.Gte{"issue.closed_unix": fromTime.Unix()}, + )) return sess } |