Mirrors
/
gitea
mirror of https://github.com/go-gitea/gitea.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix timezone on issue deadline (#11697) (#11784) 

* Fix timezone on issue deadline

* FormatDate

Co-authored-by: zeripath <art27@cantab.net>
(cherry picked from commit bbe13b60cd)
This commit is contained in:
Cirno the Strongest 2020-06-06 14:44:16 +02:00 committed by GitHub
parent 921a5c0b62
commit 287e2c781b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/timeutil/timestamp.go
View File

@ -75,6 +75,11 @@ func (ts TimeStamp) FormatShort() string {
return ts.Format("Jan 02, 2006") 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 // IsZero is zero time
func (ts TimeStamp) IsZero() bool { func (ts TimeStamp) IsZero() bool {
return ts.AsTimeInLocation(time.Local).IsZero() return ts.AsTimeInLocation(time.Local).IsZero()

2
routers/api/v1/repo/issue.go
View File

@ -691,7 +691,7 @@ func UpdateIssueDeadline(ctx *context.APIContext, form api.EditDeadlineOption) {
var deadline time.Time var deadline time.Time
if form.Deadline != nil && !form.Deadline.IsZero() { if form.Deadline != nil && !form.Deadline.IsZero() {
deadline = time.Date(form.Deadline.Year(), form.Deadline.Month(), form.Deadline.Day(), 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()) deadlineUnix = timeutil.TimeStamp(deadline.Unix())
} }

4
templates/repo/issue/view_content/sidebar.tmpl
View File

@ -28,7 +28,7 @@
{{range $.PullReviewers}} {{range $.PullReviewers}}
{{if eq .ReviewerID $ReviewerID }} {{if eq .ReviewerID $ReviewerID }}
{{$notReviewed = false }} {{$notReviewed = false }}
{{if eq .Type 4 }} {{if eq .Type 4 }}
{{$checked = true}} {{$checked = true}}
{{if or (eq $ReviewerID $.SignedUserID) $.Permission.IsAdmin}} {{if or (eq $ReviewerID $.SignedUserID) $.Permission.IsAdmin}}
@ -357,7 +357,7 @@
{{if ne .Issue.DeadlineUnix 0}} {{if ne .Issue.DeadlineUnix 0}}
<p> <p>
{{svg "octicon-calendar" 16}} {{svg "octicon-calendar" 16}}
{{.Issue.DeadlineUnix.FormatShort}} {{.Issue.DeadlineUnix.FormatDate}}
{{if .Issue.IsOverdue}} {{if .Issue.IsOverdue}}
<span style="color: red;">{{.i18n.Tr "repo.issues.due_date_overdue"}}</span> <span style="color: red;">{{.i18n.Tr "repo.issues.due_date_overdue"}}</span>
{{end}} {{end}}