Skip to content

Commit 3d7d0c3

Browse files
GiteaBotZettat123
andauthored
Check if the due_date is nil when editing issues (#32035) (#32042)
Backport #32035 by @Zettat123 Fix #32030 Co-authored-by: Zettat123 <[email protected]>
1 parent 30d989d commit 3d7d0c3

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

routers/api/v1/repo/issue.go

+10-4
Original file line numberDiff line numberDiff line change
@@ -828,10 +828,16 @@ func EditIssue(ctx *context.APIContext) {
828828
if (form.Deadline != nil || form.RemoveDeadline != nil) && canWrite {
829829
var deadlineUnix timeutil.TimeStamp
830830

831-
if (form.RemoveDeadline == nil || !*form.RemoveDeadline) && !form.Deadline.IsZero() {
832-
deadline := time.Date(form.Deadline.Year(), form.Deadline.Month(), form.Deadline.Day(),
833-
23, 59, 59, 0, form.Deadline.Location())
834-
deadlineUnix = timeutil.TimeStamp(deadline.Unix())
831+
if form.RemoveDeadline == nil || !*form.RemoveDeadline {
832+
if form.Deadline == nil {
833+
ctx.Error(http.StatusBadRequest, "", "The due_date cannot be empty")
834+
return
835+
}
836+
if !form.Deadline.IsZero() {
837+
deadline := time.Date(form.Deadline.Year(), form.Deadline.Month(), form.Deadline.Day(),
838+
23, 59, 59, 0, form.Deadline.Location())
839+
deadlineUnix = timeutil.TimeStamp(deadline.Unix())
840+
}
835841
}
836842

837843
if err := issues_model.UpdateIssueDeadline(ctx, issue, deadlineUnix, ctx.Doer); err != nil {

0 commit comments

Comments
 (0)