self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-06-15 23:00:36 +02:00
Code Issues Releases Activity

All: Fixes #3334: Prevent notebook to be the parent of itself

Browse Source
This commit is contained in:
Laurent Cozic
2020-06-07 12:47:43 +01:00
parent 5be8c2cdcf
commit f36e0c2513
2 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ReactNativeClient/lib/models/Folder.js
View File

@ -125,6 +125,11 @@ class Folder extends BaseItem {
const folder = foldersById[parentId];
if (!folder) break; // https://github.com/laurent22/joplin/issues/2079
folder.note_count = (folder.note_count || 0) + noteCount.note_count;
// Should not happen anymore but just to be safe, add the check below
// https://github.com/laurent22/joplin/issues/3334
if (folder.id === folder.parent_id) break;
parentId = folder.parent_id;
} while (parentId);
});
@ -403,6 +408,10 @@ class Folder extends BaseItem {
if (!('duplicateCheck' in options)) options.duplicateCheck = true;
if (!('reservedTitleCheck' in options)) options.reservedTitleCheck = true;
if (!('stripLeftSlashes' in options)) options.stripLeftSlashes = true;
if (o.id && o.parent_id && o.id === o.parent_id) {
throw new Error('Parent ID cannot be the same as ID');
}
}
if (options.stripLeftSlashes === true && o.title) {