aniani/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2024-09-05 23:34:19 -04:00
Code

Fix deadline on update issue or PR via API (#8699)

Browse Source
This commit is contained in:
David Svantesson 2019-10-28 00:36:28 +01:00 committed by Lauris BH
parent 76bbcf1387
commit b2c3a7d79f
2 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -310,14 +310,13 @@ func EditIssue(ctx *context.APIContext, form api.EditIssueOption) {
} }
// Update the deadline // Update the deadline
var deadlineUnix util.TimeStamp
if form.Deadline != nil && !form.Deadline.IsZero() && ctx.Repo.CanWrite(models.UnitTypeIssues) { if form.Deadline != nil && !form.Deadline.IsZero() && ctx.Repo.CanWrite(models.UnitTypeIssues) {
deadlineUnix = util.TimeStamp(form.Deadline.Unix()) deadlineUnix := util.TimeStamp(form.Deadline.Unix())
} if err := models.UpdateIssueDeadline(issue, deadlineUnix, ctx.User); err != nil {
ctx.Error(500, "UpdateIssueDeadline", err)
if err := models.UpdateIssueDeadline(issue, deadlineUnix, ctx.User); err != nil { return
ctx.Error(500, "UpdateIssueDeadline", err) }
return issue.DeadlineUnix = deadlineUnix
} }
// Add/delete assignees // Add/delete assignees

13
routers/api/v1/repo/pull.go
View File

@ -375,14 +375,13 @@ func EditPullRequest(ctx *context.APIContext, form api.EditPullRequestOption) {
} }
// Update Deadline // Update Deadline
var deadlineUnix util.TimeStamp
if form.Deadline != nil && !form.Deadline.IsZero() { if form.Deadline != nil && !form.Deadline.IsZero() {
deadlineUnix = util.TimeStamp(form.Deadline.Unix()) deadlineUnix := util.TimeStamp(form.Deadline.Unix())
} if err := models.UpdateIssueDeadline(issue, deadlineUnix, ctx.User); err != nil {
ctx.Error(500, "UpdateIssueDeadline", err)
if err := models.UpdateIssueDeadline(issue, deadlineUnix, ctx.User); err != nil { return
ctx.Error(500, "UpdateIssueDeadline", err) }
return issue.DeadlineUnix = deadlineUnix
} }
// Add/delete assignees // Add/delete assignees