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

Fixed synchronizer conflict handling when deleting folders

Browse Source
This commit is contained in:
Laurent Cozic
2017-07-13 18:47:31 +00:00
parent e397ad197d
commit 7859a1b990
12 changed files with 149 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
ReactNativeClient/lib/database.js
View File

@ -213,8 +213,15 @@ class Database {
}
if (typeof where != 'string') {
params.push(where.id);
where = 'id=?';
let s = [];
for (let n in where) {
if (!where.hasOwnProperty(n)) continue;
params.push(where[n]);
s.push('`' + n + '`=?');
}
where = s.join(' AND ');
// params.push(where.id);
// where = 'id=?';
}
return {