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

Got tags working and fixed sync issue

Browse Source
This commit is contained in:
Laurent Cozic
2017-10-22 18:12:16 +01:00
parent 0ee82bd5ce
commit 17b8df2abc
10 changed files with 238 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ReactNativeClient/lib/synchronizer.js
View File

@ -413,7 +413,6 @@ class Synchronizer {
let newContent = Object.assign({}, content);
let options = {
autoTimestamp: false,
applyMetadataChanges: true,
nextQueries: BaseItem.updateSyncTimeQueries(syncTargetId, newContent, time.unixMs()),
};
if (action == 'createLocal') options.isNew = true;
@ -424,6 +423,9 @@ class Synchronizer {
await this.api().get(remoteResourceContentPath, { path: localResourceContentPath, target: 'file' });
}
if (!newContent.user_updated_time) newContent.user_updated_time = newContent.updated_time;
if (!newContent.user_created_time) newContent.user_created_time = newContent.created_time;
await ItemClass.save(newContent, options);
} else if (action == 'deleteLocal') {