Skip to content

Commit 244d106

Browse files
committed
Due date time of issues and milestones is set to 23:59:59
1 parent 6e20b50 commit 244d106

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

routers/api/v1/repo/issue.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"fmt"
1010
"net/http"
1111
"strings"
12+
"time"
1213

1314
"code.gitea.io/gitea/models"
1415
"code.gitea.io/gitea/modules/context"
@@ -410,14 +411,17 @@ func UpdateIssueDeadline(ctx *context.APIContext, form api.EditDeadlineOption) {
410411
}
411412

412413
var deadlineUnix util.TimeStamp
414+
var deadline time.Time
413415
if form.Deadline != nil && !form.Deadline.IsZero() {
414-
deadlineUnix = util.TimeStamp(form.Deadline.Unix())
416+
deadline = time.Date(form.Deadline.Year(), form.Deadline.Month(), form.Deadline.Day(),
417+
23, 59, 59, 0, form.Deadline.Location())
418+
deadlineUnix = util.TimeStamp(deadline.Unix())
415419
}
416420

417421
if err := models.UpdateIssueDeadline(issue, deadlineUnix, ctx.User); err != nil {
418422
ctx.Error(500, "UpdateIssueDeadline", err)
419423
return
420424
}
421425

422-
ctx.JSON(201, api.IssueDeadline{Deadline: form.Deadline})
426+
ctx.JSON(201, api.IssueDeadline{Deadline: &deadline})
423427
}

routers/repo/milestone.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ func NewMilestonePost(ctx *context.Context, form auth.CreateMilestoneForm) {
113113
return
114114
}
115115

116+
deadline = time.Date(deadline.Year(), deadline.Month(), deadline.Day(), 23, 59, 59, 0, deadline.Location())
116117
if err = models.NewMilestone(&models.Milestone{
117118
RepoID: ctx.Repo.Repository.ID,
118119
Name: form.Title,
@@ -175,6 +176,7 @@ func EditMilestonePost(ctx *context.Context, form auth.CreateMilestoneForm) {
175176
return
176177
}
177178

179+
deadline = time.Date(deadline.Year(), deadline.Month(), deadline.Day(), 23, 59, 59, 0, deadline.Location())
178180
m, err := models.GetMilestoneByRepoID(ctx.Repo.Repository.ID, ctx.ParamsInt64(":id"))
179181
if err != nil {
180182
if models.IsErrMilestoneNotExist(err) {

0 commit comments

Comments
 (0)