Skip to content

Commit 2bcbfbc

Browse files
lunnyforgejo-backport-action
authored and
forgejo-backport-action
committed
demilestone should not include milestone (go-gitea#32923)
Fix go-gitea#32887 (cherry picked from commit f44712f) Conflicts: services/issue/milestone_test.go trivial conflicts (require vs assert) (cherry picked from commit 2ffa9a5)
1 parent 4999de5 commit 2bcbfbc

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

services/issue/milestone.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,10 @@ func changeMilestoneAssign(ctx context.Context, doer *user_model.User, issue *is
8585
}
8686
}
8787

88+
if issue.MilestoneID == 0 {
89+
issue.Milestone = nil
90+
}
91+
8892
return nil
8993
}
9094

services/issue/milestone_test.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ func TestChangeMilestoneAssign(t *testing.T) {
2424

2525
oldMilestoneID := issue.MilestoneID
2626
issue.MilestoneID = 2
27+
require.NoError(t, issue.LoadMilestone(db.DefaultContext))
2728
require.NoError(t, ChangeMilestoneAssign(db.DefaultContext, issue, doer, oldMilestoneID))
2829
unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{
2930
IssueID: issue.ID,
@@ -32,4 +33,11 @@ func TestChangeMilestoneAssign(t *testing.T) {
3233
OldMilestoneID: oldMilestoneID,
3334
})
3435
unittest.CheckConsistencyFor(t, &issues_model.Milestone{}, &issues_model.Issue{})
36+
assert.NotNil(t, issue.Milestone)
37+
38+
oldMilestoneID = issue.MilestoneID
39+
issue.MilestoneID = 0
40+
require.NoError(t, ChangeMilestoneAssign(db.DefaultContext, issue, doer, oldMilestoneID))
41+
assert.EqualValues(t, 0, issue.MilestoneID)
42+
assert.Nil(t, issue.Milestone)
3543
}

0 commit comments

Comments
 (0)