self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-06 09:19:22 +02:00
Code Issues Releases Activity

Desktop, Cli: Fixes #2331: Only de-duplicate imported notebook titles when needed

Browse Source
This commit is contained in:
Laurent Cozic
2020-06-28 18:00:51 +01:00
parent d601575549
commit eb8841379c
4 changed files with 68 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ReactNativeClient/lib/services/InteropService_Importer_Raw.js
View File

@@ -46,7 +46,7 @@ class InteropService_Importer_Raw extends InteropService_Importer_Base {
let defaultFolder_ = null;
const defaultFolder = async () => {
if (defaultFolder_) return defaultFolder_;
const folderTitle = await Folder.findUniqueItemTitle(this.options_.defaultFolderTitle ? this.options_.defaultFolderTitle : 'Imported');
const folderTitle = await Folder.findUniqueItemTitle(this.options_.defaultFolderTitle ? this.options_.defaultFolderTitle : 'Imported', '');
// eslint-disable-next-line require-atomic-updates
defaultFolder_ = await Folder.save({ title: folderTitle });
return defaultFolder_;
@@ -96,7 +96,7 @@ class InteropService_Importer_Raw extends InteropService_Importer_Base {
if (!itemIdMap[item.id]) itemIdMap[item.id] = uuid.create();
item.id = itemIdMap[item.id];
item.title = await Folder.findUniqueItemTitle(item.title);
item.title = await Folder.findUniqueItemTitle(item.title, item.parent_id);
if (item.parent_id) {
await setFolderToImportTo(item.parent_id);