diff options
Diffstat (limited to 'services')
| -rw-r--r-- | services/convert/issue.go | 1 | ||||
| -rw-r--r-- | services/convert/pull.go | 1 | ||||
| -rw-r--r-- | services/issue/issue.go | 7 |
3 files changed, 9 insertions, 0 deletions
diff --git a/services/convert/issue.go b/services/convert/issue.go index 3d1b21c6bf..bcb1618e8f 100644 --- a/services/convert/issue.go +++ b/services/convert/issue.go @@ -47,6 +47,7 @@ func ToAPIIssue(ctx context.Context, issue *issues_model.Issue) *api.Issue { Comments: issue.NumComments, Created: issue.CreatedUnix.AsTime(), Updated: issue.UpdatedUnix.AsTime(), + PinOrder: issue.PinOrder, } if issue.Repo != nil { diff --git a/services/convert/pull.go b/services/convert/pull.go index 598187ca6e..1ac0f4e96f 100644 --- a/services/convert/pull.go +++ b/services/convert/pull.go @@ -72,6 +72,7 @@ func ToAPIPullRequest(ctx context.Context, pr *issues_model.PullRequest, doer *u Deadline: apiIssue.Deadline, Created: pr.Issue.CreatedUnix.AsTimePtr(), Updated: pr.Issue.UpdatedUnix.AsTimePtr(), + PinOrder: apiIssue.PinOrder, AllowMaintainerEdit: pr.AllowMaintainerEdit, diff --git a/services/issue/issue.go b/services/issue/issue.go index d4f827e99a..06da47152c 100644 --- a/services/issue/issue.go +++ b/services/issue/issue.go @@ -153,6 +153,13 @@ func DeleteIssue(ctx context.Context, doer *user_model.User, gitRepo *git.Reposi } } + // If the Issue is pinned, we should unpin it before deletion to avoid problems with other pinned Issues + if issue.IsPinned() { + if err := issue.Unpin(ctx, doer); err != nil { + return err + } + } + notification.NotifyDeleteIssue(ctx, doer, issue) return nil |