* Fix timezone on issue deadline
* FormatDate
Co-authored-by: zeripath <art27@cantab.net>
(cherry picked from commit bbe13b60cd
)
tags/v1.12.0-rc2
@@ -75,6 +75,11 @@ func (ts TimeStamp) FormatShort() string { | |||
return ts.Format("Jan 02, 2006") | |||
} | |||
// FormatDate formats a date in YYYY-MM-DD server time zone | |||
func (ts TimeStamp) FormatDate() string { | |||
return time.Unix(int64(ts), 0).String()[:10] | |||
} | |||
// IsZero is zero time | |||
func (ts TimeStamp) IsZero() bool { | |||
return ts.AsTimeInLocation(time.Local).IsZero() |
@@ -691,7 +691,7 @@ func UpdateIssueDeadline(ctx *context.APIContext, form api.EditDeadlineOption) { | |||
var deadline time.Time | |||
if form.Deadline != nil && !form.Deadline.IsZero() { | |||
deadline = time.Date(form.Deadline.Year(), form.Deadline.Month(), form.Deadline.Day(), | |||
23, 59, 59, 0, form.Deadline.Location()) | |||
23, 59, 59, 0, time.Local) | |||
deadlineUnix = timeutil.TimeStamp(deadline.Unix()) | |||
} | |||
@@ -28,7 +28,7 @@ | |||
{{range $.PullReviewers}} | |||
{{if eq .ReviewerID $ReviewerID }} | |||
{{$notReviewed = false }} | |||
{{$notReviewed = false }} | |||
{{if eq .Type 4 }} | |||
{{$checked = true}} | |||
{{if or (eq $ReviewerID $.SignedUserID) $.Permission.IsAdmin}} | |||
@@ -357,7 +357,7 @@ | |||
{{if ne .Issue.DeadlineUnix 0}} | |||
<p> | |||
{{svg "octicon-calendar" 16}} | |||
{{.Issue.DeadlineUnix.FormatShort}} | |||
{{.Issue.DeadlineUnix.FormatDate}} | |||
{{if .Issue.IsOverdue}} | |||
<span style="color: red;">{{.i18n.Tr "repo.issues.due_date_overdue"}}</span> | |||
{{end}} |