graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-27 00:43:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

upd: add additional checks

Browse source
This commit is contained in:
Mar0xy 2023-10-22 19:19:44 +02:00
parent b43402519f
commit d49099baeb
No known key found for this signature in database
GPG key ID: 56569BBE47D2C828
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
packages/backend/src/server/api/endpoints/notes/versions.ts
View file

@ -50,13 +50,13 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
for (const edit of edits) { for (const edit of edits) {
editArray.push({ editArray.push({
oldDate: edit.oldDate, oldDate: edit.oldDate as Date | null ?? null,
updatedAt: edit.updatedAt, updatedAt: edit.updatedAt,
text: edit.oldText, text: edit.oldText ?? edit.newText ?? null,
}); });
} }
editArray = editArray.sort((a, b) => { return new Date(b.oldDate).getTime() - new Date(a.oldDate).getTime(); }); editArray = editArray.sort((a, b) => { return new Date(b.oldDate ?? b.updatedAt).getTime() - new Date(a.oldDate ?? a.updatedAt).getTime(); });
return editArray; return editArray;
}); });

2
packages/frontend/src/components/SkOldNoteWindow.vue
View file

@ -120,7 +120,7 @@ if (noteViewInterruptors.length > 0) {
} }
const replaceContent = () => { const replaceContent = () => {
note.text = props.oldText; props.oldText ? note.text = props.oldText : undefined;
note.createdAt = props.updatedAt; note.createdAt = props.updatedAt;
}; };
replaceContent(); replaceContent();