Skip to content

Commit f44712f

Browse files
authored
demilestone should not include milestone (#32923)
Fix #32887
1 parent 1a7591d commit f44712f

File tree

2 files changed

+12
-0
lines changed

2 files changed

+12
-0
lines changed

services/issue/milestone.go

+4
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,10 @@ func changeMilestoneAssign(ctx context.Context, doer *user_model.User, issue *is
5959
}
6060
}
6161

62+
if issue.MilestoneID == 0 {
63+
issue.Milestone = nil
64+
}
65+
6266
return nil
6367
}
6468

services/issue/milestone_test.go

+8
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ func TestChangeMilestoneAssign(t *testing.T) {
2323

2424
oldMilestoneID := issue.MilestoneID
2525
issue.MilestoneID = 2
26+
assert.NoError(t, issue.LoadMilestone(db.DefaultContext))
2627
assert.NoError(t, ChangeMilestoneAssign(db.DefaultContext, issue, doer, oldMilestoneID))
2728
unittest.AssertExistsAndLoadBean(t, &issues_model.Comment{
2829
IssueID: issue.ID,
@@ -31,4 +32,11 @@ func TestChangeMilestoneAssign(t *testing.T) {
3132
OldMilestoneID: oldMilestoneID,
3233
})
3334
unittest.CheckConsistencyFor(t, &issues_model.Milestone{}, &issues_model.Issue{})
35+
assert.NotNil(t, issue.Milestone)
36+
37+
oldMilestoneID = issue.MilestoneID
38+
issue.MilestoneID = 0
39+
assert.NoError(t, ChangeMilestoneAssign(db.DefaultContext, issue, doer, oldMilestoneID))
40+
assert.EqualValues(t, 0, issue.MilestoneID)
41+
assert.Nil(t, issue.Milestone)
3442
}

0 commit comments

Comments
 (0)