self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-07-16 00:14:34 +02:00
Code Issues Releases Activity

All: Fixes #6261: Ensure that note revision markup type is set correctly

Browse Source
This commit is contained in:
Laurent Cozic
2022-03-12 16:23:30 +00:00
parent f4ec73ab0e
commit addcfb0129
2 changed files with 53 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/lib/services/RevisionService.ts
View File

@ -10,6 +10,7 @@ import BaseService from './BaseService';
import { _ } from '../locale';
import { ItemChangeEntity, NoteEntity, RevisionEntity } from './database/types';
import Logger from '../Logger';
import { MarkupLanguage } from '../../renderer';
const { substrWithEllipsis } = require('../string-utils');
const { sprintf } = require('sprintf-js');
const { wrapError } = require('../errorUtils');
@ -217,7 +218,7 @@ export default class RevisionService extends BaseService {
return Revision.deleteOldRevisions(ttl);
}
async revisionNote(revisions: RevisionEntity[], index: number) {
public async revisionNote(revisions: RevisionEntity[], index: number) {
if (index < 0 || index >= revisions.length) throw new Error(`Invalid revision index: ${index}`);
const rev = revisions[index];
@ -233,6 +234,7 @@ export default class RevisionService extends BaseService {
output.updated_time = output.user_updated_time;
output.created_time = output.user_created_time;
(output as any).type_ = BaseModel.TYPE_NOTE;
if (!('markup_language' in output)) output.markup_language = MarkupLanguage.Markdown;
return output;
}