tom/forkjo
tom/forkjo
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions 1

Check if the due_date is nil when editing issues (#32035)

Browse source 
(cherry picked from commit 3a51c37672d2fbad1f222922e75ce704d5a1ac71)
(cherry picked from commit 961766744b)
This commit is contained in:
Zettat123 2024-09-15 00:40:36 +08:00 committed by forgejo-backport-action
parent f0dab9cc05
commit 300e01f733
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
routers/api/v1/repo/issue.go
View file

@ -839,10 +839,16 @@ func EditIssue(ctx *context.APIContext) {
if (form.Deadline != nil || form.RemoveDeadline != nil) && canWrite { if (form.Deadline != nil || form.RemoveDeadline != nil) && canWrite {
var deadlineUnix timeutil.TimeStamp var deadlineUnix timeutil.TimeStamp
if (form.RemoveDeadline == nil || !*form.RemoveDeadline) && !form.Deadline.IsZero() { if form.RemoveDeadline == nil || !*form.RemoveDeadline {
deadline := time.Date(form.Deadline.Year(), form.Deadline.Month(), form.Deadline.Day(), if form.Deadline == nil {
23, 59, 59, 0, form.Deadline.Location()) ctx.Error(http.StatusBadRequest, "", "The due_date cannot be empty")
deadlineUnix = timeutil.TimeStamp(deadline.Unix()) return
}
if !form.Deadline.IsZero() {
deadline := time.Date(form.Deadline.Year(), form.Deadline.Month(), form.Deadline.Day(),
23, 59, 59, 0, form.Deadline.Location())
deadlineUnix = timeutil.TimeStamp(deadline.Unix())
}
} }
if err := issues_model.UpdateIssueDeadline(ctx, issue, deadlineUnix, ctx.Doer); err != nil { if err := issues_model.UpdateIssueDeadline(ctx, issue, deadlineUnix, ctx.Doer); err != nil {