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>
This commit is contained in:
parent
3b2ed4762e
commit
dc2613600c
2 changed files with 13 additions and 8 deletions
|
@ -2127,13 +2127,6 @@ func UpdateCommentContent(ctx *context.Context) {
|
||||||
return
|
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)) {
|
if !ctx.IsSigned || (ctx.User.ID != comment.PosterID && !ctx.Repo.CanWriteIssuesOrPulls(comment.Issue.IsPull)) {
|
||||||
ctx.Error(http.StatusForbidden)
|
ctx.Error(http.StatusForbidden)
|
||||||
return
|
return
|
||||||
|
@ -2155,6 +2148,17 @@ func UpdateCommentContent(ctx *context.Context) {
|
||||||
return
|
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 {
|
if err := updateAttachments(comment, ctx.FormStrings("files[]")); err != nil {
|
||||||
ctx.ServerError("UpdateAttachments", err)
|
ctx.ServerError("UpdateAttachments", err)
|
||||||
return
|
return
|
||||||
|
|
|
@ -46,9 +46,10 @@ export function initMarkupTasklist() {
|
||||||
const {updateUrl, context} = editContentZone.dataset;
|
const {updateUrl, context} = editContentZone.dataset;
|
||||||
|
|
||||||
await $.post(updateUrl, {
|
await $.post(updateUrl, {
|
||||||
|
ignore_attachments: true,
|
||||||
_csrf: window.config.csrf,
|
_csrf: window.config.csrf,
|
||||||
content: newContent,
|
content: newContent,
|
||||||
context,
|
context
|
||||||
});
|
});
|
||||||
|
|
||||||
rawContent.textContent = newContent;
|
rawContent.textContent = newContent;
|
||||||
|
|
Loading…
Reference in a new issue