File tree Expand file tree Collapse file tree 3 files changed +15
-10
lines changed Expand file tree Collapse file tree 3 files changed +15
-10
lines changed Original file line number Diff line number Diff line change @@ -231,25 +231,19 @@ func (c *Comment) LoadMilestone() error {
231
231
has , err := x .ID (c .OldMilestoneID ).Get (& oldMilestone )
232
232
if err != nil {
233
233
return err
234
- } else if ! has {
235
- return ErrMilestoneNotExist {
236
- ID : c .OldMilestoneID ,
237
- }
234
+ } else if has {
235
+ c .OldMilestone = & oldMilestone
238
236
}
239
- c .OldMilestone = & oldMilestone
240
237
}
241
238
242
239
if c .MilestoneID > 0 {
243
240
var milestone Milestone
244
241
has , err := x .ID (c .MilestoneID ).Get (& milestone )
245
242
if err != nil {
246
243
return err
247
- } else if ! has {
248
- return ErrMilestoneNotExist {
249
- ID : c .MilestoneID ,
250
- }
244
+ } else if has {
245
+ c .Milestone = & milestone
251
246
}
252
- c .Milestone = & milestone
253
247
}
254
248
return nil
255
249
}
Original file line number Diff line number Diff line change @@ -558,6 +558,7 @@ issues.remove_label_at = `removed the <div class="ui label" style="color: %s; ba
558
558
issues.add_milestone_at = `added this to the <b>%s</b> milestone %s`
559
559
issues.change_milestone_at = `modified the milestone from <b>%s</b> to <b>%s</b> %s`
560
560
issues.remove_milestone_at = `removed this from the <b>%s</b> milestone %s`
561
+ issues.deleted_milestone = `(deleted)`
561
562
issues.self_assign_at = `self-assigned this %s`
562
563
issues.add_assignee_at = `was assigned by <b>%s</b> %s`
563
564
issues.remove_assignee_at = `removed their assignment %s`
Original file line number Diff line number Diff line change @@ -596,6 +596,16 @@ func ViewIssue(ctx *context.Context) {
596
596
ctx .Handle (500 , "LoadMilestone" , err )
597
597
return
598
598
}
599
+ ghostMilestone := & models.Milestone {
600
+ ID : - 1 ,
601
+ Name : ctx .Tr ("repo.issues.deleted_milestone" ),
602
+ }
603
+ if comment .OldMilestoneID > 0 && comment .OldMilestone == nil {
604
+ comment .OldMilestone = ghostMilestone
605
+ }
606
+ if comment .MilestoneID > 0 && comment .Milestone == nil {
607
+ comment .Milestone = ghostMilestone
608
+ }
599
609
} else if comment .Type == models .CommentTypeAssignees {
600
610
if err = comment .LoadAssignees (); err != nil {
601
611
ctx .Handle (500 , "LoadAssignees" , err )
You can’t perform that action at this time.
0 commit comments