forks/forgejo
1
0
Fork 0
Code Releases Activity

Merge pull request #2565 from tkausl/issue2563

Browse source 
fixes #2563
This commit is contained in:
Unknwon 2016-02-05 19:15:54 -05:00
commit 10fbb1aa2f
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
models/issue.go
View file

@ -1179,6 +1179,7 @@ func (m *Milestone) AfterSet(colName string, _ xorm.Cell) {
if m.Deadline.Year() == 9999 { if m.Deadline.Year() == 9999 {
return return
} }
m.Deadline = regulateTimeZone(m.Deadline)
m.DeadlineString = m.Deadline.Format("2006-01-02") m.DeadlineString = m.Deadline.Format("2006-01-02")
if time.Now().After(m.Deadline) { if time.Now().After(m.Deadline) {

4
routers/repo/issue.go
View file

@ -1079,7 +1079,7 @@ func NewMilestonePost(ctx *middleware.Context, form auth.CreateMilestoneForm) {
if len(form.Deadline) == 0 { if len(form.Deadline) == 0 {
form.Deadline = "9999-12-31" form.Deadline = "9999-12-31"
} }
deadline, err := time.Parse("2006-01-02", form.Deadline) deadline, err := time.ParseInLocation("2006-01-02", form.Deadline, time.Local)
if err != nil { if err != nil {
ctx.Data["Err_Deadline"] = true ctx.Data["Err_Deadline"] = true
ctx.RenderWithErr(ctx.Tr("repo.milestones.invalid_due_date_format"), MILESTONE_NEW, &form) ctx.RenderWithErr(ctx.Tr("repo.milestones.invalid_due_date_format"), MILESTONE_NEW, &form)
@ -1139,7 +1139,7 @@ func EditMilestonePost(ctx *middleware.Context, form auth.CreateMilestoneForm) {
if len(form.Deadline) == 0 { if len(form.Deadline) == 0 {
form.Deadline = "9999-12-31" form.Deadline = "9999-12-31"
} }
deadline, err := time.Parse("2006-01-02", form.Deadline) deadline, err := time.ParseInLocation("2006-01-02", form.Deadline, time.Local)
if err != nil { if err != nil {
ctx.Data["Err_Deadline"] = true ctx.Data["Err_Deadline"] = true
ctx.RenderWithErr(ctx.Tr("repo.milestones.invalid_due_date_format"), MILESTONE_NEW, &form) ctx.RenderWithErr(ctx.Tr("repo.milestones.invalid_due_date_format"), MILESTONE_NEW, &form)