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

Revert "All: Added support for hierarchical/nested tags (#2572)"

Browse Source 
This reverts commit e11e57f1d8.
This commit is contained in:
Laurent Cozic
2020-07-28 18:50:34 +01:00
parent 89e6b680a6
commit 64d7603eed
31 changed files with 191 additions and 991 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ReactNativeClient/lib/synchronizer.js
View File

@ -1,7 +1,6 @@
const BaseItem = require('lib/models/BaseItem.js');
const Folder = require('lib/models/Folder.js');
const Note = require('lib/models/Note.js');
const Tag = require('lib/models/Tag.js');
const Resource = require('lib/models/Resource.js');
const ItemChange = require('lib/models/ItemChange.js');
const Setting = require('lib/models/Setting.js');
@ -777,15 +776,7 @@ class Synchronizer {
}
const ItemClass = BaseItem.itemClass(local.type_);
if (ItemClass === Tag) {
await Tag.delete(local.id, {
trackDeleted: false,
changeSource: ItemChange.SOURCE_SYNC,
deleteChildren: false,
deleteNotelessParents: false });
} else {
await ItemClass.delete(local.id, { trackDeleted: false, changeSource: ItemChange.SOURCE_SYNC });
}
await ItemClass.delete(local.id, { trackDeleted: false, changeSource: ItemChange.SOURCE_SYNC });
}
}