Docker/forgejo
Docker/forgejo
1
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2025-08-05 09:55:20 +02:00
Code Issues Releases Activity

[v11.0/forgejo] fix: load OldMilestone based on OldMilestoneID, not MilestoneID (#8522)

Browse source 
**Manual Backport:** https://codeberg.org/forgejo/forgejo/pulls/8330

The commit which was adding tests was excluded because the tests extended the ones from #8214 (which was not backported); see https://codeberg.org/forgejo/forgejo/pulls/8330#issuecomment-5644307.

Fixes #8329

Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/8522
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Co-authored-by: floss4good <floss4good@noreply.codeberg.org>
Co-committed-by: floss4good <floss4good@noreply.codeberg.org>
This commit is contained in:
floss4good 2025-07-16 18:20:39 +02:00 • committed by Gusted
parent e86730289b
commit 31323ed721
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
models/issues/comment_list.go
View file

@ -101,7 +101,7 @@ func (comments CommentList) loadMilestones(ctx context.Context) error {
return nil return nil
} }
milestoneMaps := make(map[int64]*Milestone, len(milestoneIDs)) milestones := make(map[int64]*Milestone, len(milestoneIDs))
left := len(milestoneIDs) left := len(milestoneIDs)
for left > 0 { for left > 0 {
limit := db.DefaultMaxInSize limit := db.DefaultMaxInSize
@ -110,7 +110,7 @@ func (comments CommentList) loadMilestones(ctx context.Context) error {
} }
err := db.GetEngine(ctx). err := db.GetEngine(ctx).
In("id", milestoneIDs[:limit]). In("id", milestoneIDs[:limit]).
Find(&milestoneMaps) Find(&milestones)
if err != nil { if err != nil {
return err return err
} }
@ -118,8 +118,8 @@ func (comments CommentList) loadMilestones(ctx context.Context) error {
milestoneIDs = milestoneIDs[limit:] milestoneIDs = milestoneIDs[limit:]
} }
for _, issue := range comments { for _, comment := range comments {
issue.Milestone = milestoneMaps[issue.MilestoneID] comment.Milestone = milestones[comment.MilestoneID]
} }
return nil return nil
} }
@ -140,7 +140,7 @@ func (comments CommentList) loadOldMilestones(ctx context.Context) error {
return nil return nil
} }
milestoneMaps := make(map[int64]*Milestone, len(milestoneIDs)) milestones := make(map[int64]*Milestone, len(milestoneIDs))
left := len(milestoneIDs) left := len(milestoneIDs)
for left > 0 { for left > 0 {
limit := db.DefaultMaxInSize limit := db.DefaultMaxInSize
@ -149,7 +149,7 @@ func (comments CommentList) loadOldMilestones(ctx context.Context) error {
} }
err := db.GetEngine(ctx). err := db.GetEngine(ctx).
In("id", milestoneIDs[:limit]). In("id", milestoneIDs[:limit]).
Find(&milestoneMaps) Find(&milestones)
if err != nil { if err != nil {
return err return err
} }
@ -157,8 +157,8 @@ func (comments CommentList) loadOldMilestones(ctx context.Context) error {
milestoneIDs = milestoneIDs[limit:] milestoneIDs = milestoneIDs[limit:]
} }
for _, issue := range comments { for _, comment := range comments {
issue.OldMilestone = milestoneMaps[issue.MilestoneID] comment.OldMilestone = milestones[comment.OldMilestoneID]
} }
return nil return nil
} }