IntenseWebs/gitea
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix deleted milestone bug (#1942)

Browse Source 
* Fix deleted milestone bug

* Use locale for ghost milestone name

* Fix pointer bug
This commit is contained in:
Ethan Koenig 2017-06-17 00:51:28 -04:00 committed by Lunny Xiao
parent ce9b86082c
commit 8fc64741d9
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
models/issue_comment.go
View File

@ -231,12 +231,9 @@ func (c *Comment) LoadMilestone() error {
has, err := x.ID(c.OldMilestoneID).Get(&oldMilestone) has, err := x.ID(c.OldMilestoneID).Get(&oldMilestone)
if err != nil { if err != nil {
return err return err
} else if !has { } else if has {
return ErrMilestoneNotExist{ c.OldMilestone = &oldMilestone
ID: c.OldMilestoneID,
}
} }
c.OldMilestone = &oldMilestone
} }
if c.MilestoneID > 0 { if c.MilestoneID > 0 {
@ -244,12 +241,9 @@ func (c *Comment) LoadMilestone() error {
has, err := x.ID(c.MilestoneID).Get(&milestone) has, err := x.ID(c.MilestoneID).Get(&milestone)
if err != nil { if err != nil {
return err return err
} else if !has { } else if has {
return ErrMilestoneNotExist{ c.Milestone = &milestone
ID: c.MilestoneID,
}
} }
c.Milestone = &milestone
} }
return nil return nil
} }

1
options/locale/locale_en-US.ini
View File

@ -612,6 +612,7 @@ issues.remove_label_at = `removed the <div class="ui label" style="color: %s; ba
issues.add_milestone_at = `added this to the <b>%s</b> milestone %s` issues.add_milestone_at = `added this to the <b>%s</b> milestone %s`
issues.change_milestone_at = `modified the milestone from <b>%s</b> to <b>%s</b> %s` issues.change_milestone_at = `modified the milestone from <b>%s</b> to <b>%s</b> %s`
issues.remove_milestone_at = `removed this from the <b>%s</b> milestone %s` issues.remove_milestone_at = `removed this from the <b>%s</b> milestone %s`
issues.deleted_milestone = `(deleted)`
issues.self_assign_at = `self-assigned this %s` issues.self_assign_at = `self-assigned this %s`
issues.add_assignee_at = `was assigned by <b>%s</b> %s` issues.add_assignee_at = `was assigned by <b>%s</b> %s`
issues.remove_assignee_at = `removed their assignment %s` issues.remove_assignee_at = `removed their assignment %s`

10
routers/repo/issue.go
View File

@ -625,6 +625,16 @@ func ViewIssue(ctx *context.Context) {
ctx.Handle(500, "LoadMilestone", err) ctx.Handle(500, "LoadMilestone", err)
return return
} }
ghostMilestone := &models.Milestone{
ID: -1,
Name: ctx.Tr("repo.issues.deleted_milestone"),
}
if comment.OldMilestoneID > 0 && comment.OldMilestone == nil {
comment.OldMilestone = ghostMilestone
}
if comment.MilestoneID > 0 && comment.Milestone == nil {
comment.Milestone = ghostMilestone
}
} else if comment.Type == models.CommentTypeAssignees { } else if comment.Type == models.CommentTypeAssignees {
if err = comment.LoadAssignees(); err != nil { if err = comment.LoadAssignees(); err != nil {
ctx.Handle(500, "LoadAssignees", err) ctx.Handle(500, "LoadAssignees", err)