From 018b0e818038f3c38cc6bfc96fadeb25c92380e6 Mon Sep 17 00:00:00 2001
From: David Svantesson <davidsvantesson@gmail.com>
Date: Mon, 28 Oct 2019 00:35:20 +0100
Subject: [PATCH] Fix deadline on update issue or PR via API (#8696)
* Fix deadline on update issue or PR via API
* variable initialized directly (review comment)
---
routers/api/v1/repo/issue.go | 15 +++++++--------
routers/api/v1/repo/pull.go | 15 +++++++--------
2 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/routers/api/v1/repo/issue.go b/routers/api/v1/repo/issue.go
index 9529e09b29..a41abba4cd 100644
--- a/routers/api/v1/repo/issue.go
+++ b/routers/api/v1/repo/issue.go
@@ -336,14 +336,13 @@ func EditIssue(ctx *context.APIContext, form api.EditIssueOption) {
}
// Update the deadline
- var deadlineUnix timeutil.TimeStamp
- if form.Deadline != nil && !form.Deadline.IsZero() && ctx.Repo.CanWrite(models.UnitTypeIssues) {
- deadlineUnix = timeutil.TimeStamp(form.Deadline.Unix())
- }
-
- if err := models.UpdateIssueDeadline(issue, deadlineUnix, ctx.User); err != nil {
- ctx.Error(500, "UpdateIssueDeadline", err)
- return
+ if form.Deadline != nil && ctx.Repo.CanWrite(models.UnitTypeIssues) {
+ deadlineUnix := timeutil.TimeStamp(form.Deadline.Unix())
+ if err := models.UpdateIssueDeadline(issue, deadlineUnix, ctx.User); err != nil {
+ ctx.Error(500, "UpdateIssueDeadline", err)
+ return
+ }
+ issue.DeadlineUnix = deadlineUnix
}
// Add/delete assignees
diff --git a/routers/api/v1/repo/pull.go b/routers/api/v1/repo/pull.go
index 6b20844c51..77fb452938 100644
--- a/routers/api/v1/repo/pull.go
+++ b/routers/api/v1/repo/pull.go
@@ -392,14 +392,13 @@ func EditPullRequest(ctx *context.APIContext, form api.EditPullRequestOption) {
}
// Update Deadline
- var deadlineUnix timeutil.TimeStamp
- if form.Deadline != nil && !form.Deadline.IsZero() {
- deadlineUnix = timeutil.TimeStamp(form.Deadline.Unix())
- }
-
- if err := models.UpdateIssueDeadline(issue, deadlineUnix, ctx.User); err != nil {
- ctx.Error(500, "UpdateIssueDeadline", err)
- return
+ if form.Deadline != nil {
+ deadlineUnix := timeutil.TimeStamp(form.Deadline.Unix())
+ if err := models.UpdateIssueDeadline(issue, deadlineUnix, ctx.User); err != nil {
+ ctx.Error(500, "UpdateIssueDeadline", err)
+ return
+ }
+ issue.DeadlineUnix = deadlineUnix
}
// Add/delete assignees