From ba6baff6966f94a95243b02326add57335de5ef5 Mon Sep 17 00:00:00 2001
From: zeripath <art27@cantab.net>
Date: Thu, 26 Aug 2021 00:04:58 +0100
Subject: [PATCH] Report the correct number of pushes on the feeds (#16811)
* Report the correct number of pushes on the feeds
Since the number of commits in the Action table has been limited to 5
the number of commits reported on the feeds page is now incorrectly also
limited to 5. The correct number is available as the Len and this PR
changes this to report this.
Fix #16804
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Update templates/user/dashboard/feeds.tmpl
Co-authored-by: techknowlogick <techknowlogick@gitea.io>
---
modules/repository/commits.go | 10 +++++++++-
modules/templates/helper.go | 5 +++++
templates/user/dashboard/feeds.tmpl | 2 +-
3 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/modules/repository/commits.go b/modules/repository/commits.go
index 7f22105745..1558d85639 100644
--- a/modules/repository/commits.go
+++ b/modules/repository/commits.go
@@ -30,6 +30,7 @@ type PushCommits struct {
Commits []*PushCommit
HeadCommit *PushCommit
CompareURL string
+ Len int
avatars map[string]string
emailUsers map[string]*models.User
@@ -180,5 +181,12 @@ func GitToPushCommits(gitCommits []*git.Commit) *PushCommits {
for _, commit := range gitCommits {
commits = append(commits, CommitToPushCommit(commit))
}
- return &PushCommits{commits, nil, "", make(map[string]string), make(map[string]*models.User)}
+ return &PushCommits{
+ Commits: commits,
+ HeadCommit: nil,
+ CompareURL: "",
+ Len: len(commits),
+ avatars: make(map[string]string),
+ emailUsers: make(map[string]*models.User),
+ }
}
diff --git a/modules/templates/helper.go b/modules/templates/helper.go
index 6517127ebf..00b07dcec9 100644
--- a/modules/templates/helper.go
+++ b/modules/templates/helper.go
@@ -819,6 +819,11 @@ func ActionContent2Commits(act Actioner) *repository.PushCommits {
if err := json.Unmarshal([]byte(act.GetContent()), push); err != nil {
log.Error("json.Unmarshal:\n%s\nERROR: %v", act.GetContent(), err)
}
+
+ if push.Len == 0 {
+ push.Len = len(push.Commits)
+ }
+
return push
}
diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl
index 1b770d4472..83d064dc95 100644
--- a/templates/user/dashboard/feeds.tmpl
+++ b/templates/user/dashboard/feeds.tmpl
@@ -99,7 +99,7 @@
</span>
</li>
{{end}}
- {{if and (gt (len $push.Commits) 1) $push.CompareURL}}<li><a href="{{AppSubUrl}}/{{$push.CompareURL}}">{{$.i18n.Tr "action.compare_commits" (len $push.Commits)}} »</a></li>{{end}}
+ {{if and (gt $push.Len 1) $push.CompareURL}}<li><a href="{{AppSubUrl}}/{{$push.CompareURL}}">{{$.i18n.Tr "action.compare_commits" $push.Len}} »</a></li>{{end}}
</ul>
</div>
{{else if eq .GetOpType 6}}