Check if the due_date
is nil when editing issues (#32035)
(cherry picked from commit 3a51c37672d2fbad1f222922e75ce704d5a1ac71)
This commit is contained in:
parent
565084925a
commit
961766744b
1 changed files with 10 additions and 4 deletions
|
@ -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 {
|
||||||
|
|
Loading…
Reference in a new issue