gaschz/trilium
1
0
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2025-06-06 18:08:33 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

check the attachment after conversion

Browse Source
This commit is contained in:
zadam 2023-07-14 21:18:56 +02:00
parent ff6f2a4d44
commit cea54aecad
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/becca/entities/battachment.js
View File

@ -124,9 +124,7 @@ class BAttachment extends AbstractBeccaEntity {
this._setContent(content, opts); this._setContent(content, opts);
} }
/** /** @returns {{note: BNote, branch: BBranch}} */
* @returns {{note: BNote, branch: BBranch}}
*/
convertToNote() { convertToNote() {
if (this.type === 'search') { if (this.type === 'search') {
throw new Error(`Note of type search cannot have child notes`); throw new Error(`Note of type search cannot have child notes`);

3
src/becca/entities/bnote.js
View File

@ -1495,6 +1495,9 @@ class BNote extends AbstractBeccaEntity {
parentNote.setContent(fixedContent); parentNote.setContent(fixedContent);
const noteService = require("../../services/notes");
noteService.asyncPostProcessContent(parentNote, fixedContent);
this.deleteNote(); this.deleteNote();
return attachment; return attachment;

10
src/public/app/widgets/attachment_detail.js
View File

@ -153,12 +153,12 @@ export default class AttachmentDetailWidget extends BasicWidget {
$deletionWarning.show(); $deletionWarning.show();
if (willBeDeletedInMs >= 60000) { if (willBeDeletedInMs >= 60000) {
$deletionWarning.text(`This attachment will be deleted in ${utils.formatTimeInterval(willBeDeletedInMs)}`); $deletionWarning.text(`This attachment will be automatically deleted in ${utils.formatTimeInterval(willBeDeletedInMs)}`);
} else { } else {
$deletionWarning.text(`This attachment will be deleted soon`); $deletionWarning.text(`This attachment will be automatically deleted soon`);
} }
$deletionWarning.append(", because the attachment is not linked in the note's content. To prevent deletion, add the attachment link back into the content."); $deletionWarning.append(", because the attachment is not linked in the note's content. To prevent deletion, add the attachment link back into the content or convert the attachment into note.");
} else { } else {
this.$wrapper.removeClass("scheduled-for-deletion"); this.$wrapper.removeClass("scheduled-for-deletion");
$deletionWarning.hide(); $deletionWarning.hide();
@ -185,11 +185,11 @@ export default class AttachmentDetailWidget extends BasicWidget {
}); });
utils.copyHtmlToClipboard($link[0].outerHTML); utils.copyHtmlToClipboard($link[0].outerHTML);
toastService.showMessage("Attachment link copied to clipboard.");
} else { } else {
throw new Error(`Unrecognized attachment role '${this.attachment.role}'.`); throw new Error(`Unrecognized attachment role '${this.attachment.role}'.`);
} }
toastService.showMessage("Attachment link copied to clipboard.");
} }
async entitiesReloadedEvent({loadResults}) { async entitiesReloadedEvent({loadResults}) {