Browse Source

Keep attachments on tasklist update (#16750)

* Send attachments too.

* Use tasklist flag.

* use action="ignoreAttachments" instead of "tasklist"

* Use boolean parameter.

Co-authored-by: zeripath <art27@cantab.net>
tags/v1.16.0-rc1
KN4CK3R 2 years ago
parent
commit
dc2613600c
No account linked to committer's email address
2 changed files with 13 additions and 8 deletions
  1. 11
    7
      routers/web/repo/issue.go
  2. 2
    1
      web_src/js/markup/tasklist.js

+ 11
- 7
routers/web/repo/issue.go View File

@@ -2127,13 +2127,6 @@ func UpdateCommentContent(ctx *context.Context) {
return
}

if comment.Type == models.CommentTypeComment {
if err := comment.LoadAttachments(); err != nil {
ctx.ServerError("LoadAttachments", err)
return
}
}

if !ctx.IsSigned || (ctx.User.ID != comment.PosterID && !ctx.Repo.CanWriteIssuesOrPulls(comment.Issue.IsPull)) {
ctx.Error(http.StatusForbidden)
return
@@ -2155,6 +2148,17 @@ func UpdateCommentContent(ctx *context.Context) {
return
}

if ctx.FormBool("ignore_attachments") {
return
}

if comment.Type == models.CommentTypeComment {
if err := comment.LoadAttachments(); err != nil {
ctx.ServerError("LoadAttachments", err)
return
}
}

if err := updateAttachments(comment, ctx.FormStrings("files[]")); err != nil {
ctx.ServerError("UpdateAttachments", err)
return

+ 2
- 1
web_src/js/markup/tasklist.js View File

@@ -46,9 +46,10 @@ export function initMarkupTasklist() {
const {updateUrl, context} = editContentZone.dataset;

await $.post(updateUrl, {
ignore_attachments: true,
_csrf: window.config.csrf,
content: newContent,
context,
context
});

rawContent.textContent = newContent;

Loading…
Cancel
Save