diff options
| author | Unknwon <u@gogs.io> | 2016-02-05 19:15:54 -0500 |
|---|---|---|
| committer | Unknwon <u@gogs.io> | 2016-02-05 19:15:54 -0500 |
| commit | 10fbb1aa2f641546c4fdaee6c6ef7111586bd4e3 (patch) | |
| tree | 1a65544956297ba76c1afb423b2de25794b83114 | |
| parent | e797a225b6d1b4d18d8988915d62e9f19073eda1 (diff) | |
| parent | bc0eee48d5750bc57bd7f4b4a485222a91357220 (diff) | |
| download | gitea-10fbb1aa2f641546c4fdaee6c6ef7111586bd4e3.tar.gz gitea-10fbb1aa2f641546c4fdaee6c6ef7111586bd4e3.zip | |
Merge pull request #2565 from tkausl/issue2563
fixes #2563
| -rw-r--r-- | models/issue.go | 1 | ||||
| -rw-r--r-- | routers/repo/issue.go | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/models/issue.go b/models/issue.go index 6188da5c63..326454630e 100644 --- a/models/issue.go +++ b/models/issue.go @@ -1179,6 +1179,7 @@ func (m *Milestone) AfterSet(colName string, _ xorm.Cell) { if m.Deadline.Year() == 9999 { return } + m.Deadline = regulateTimeZone(m.Deadline) m.DeadlineString = m.Deadline.Format("2006-01-02") if time.Now().After(m.Deadline) { diff --git a/routers/repo/issue.go b/routers/repo/issue.go index 57852a5ad3..635dee930e 100644 --- a/routers/repo/issue.go +++ b/routers/repo/issue.go @@ -1079,7 +1079,7 @@ func NewMilestonePost(ctx *middleware.Context, form auth.CreateMilestoneForm) { if len(form.Deadline) == 0 { 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 { ctx.Data["Err_Deadline"] = true 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 { 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 { ctx.Data["Err_Deadline"] = true ctx.RenderWithErr(ctx.Tr("repo.milestones.invalid_due_date_format"), MILESTONE_NEW, &form) |