suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix file conflict resolution after f0770fa84d

Browse Source 
merge.xul now returns an object with .data and .selected instead of
returning .data directly
This commit is contained in:
Dan Stillman 2017-10-27 04:07:35 -04:00
parent 2184952551
commit 196e45c849
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
chrome/content/zotero/xpcom/collectionTreeView.js
View File

@ -2192,6 +2192,7 @@ Zotero.CollectionTreeView.prototype.drop = Zotero.Promise.coroutine(function* (r
lastWin.openDialog('chrome://zotero/content/merge.xul', '', 'chrome,modal,centerscreen', io); lastWin.openDialog('chrome://zotero/content/merge.xul', '', 'chrome,modal,centerscreen', io);
yield Zotero.DB.executeTransaction(function* () { yield Zotero.DB.executeTransaction(function* () {
// DEBUG: This probably needs to be updated if this starts being used
for (let obj of io.dataOut) { for (let obj of io.dataOut) {
yield obj.ref.save(); yield obj.ref.save();
} }

3
chrome/content/zotero/xpcom/storage/storageLocal.js
View File

@ -1026,11 +1026,12 @@ Zotero.Sync.Storage.Local = {
if (!io.dataOut) { if (!io.dataOut) {
return false; return false;
} }
yield Zotero.DB.executeTransaction(function* () { yield Zotero.DB.executeTransaction(function* () {
for (let i = 0; i < conflicts.length; i++) { for (let i = 0; i < conflicts.length; i++) {
let conflict = conflicts[i]; let conflict = conflicts[i];
let item = Zotero.Items.getByLibraryAndKey(libraryID, conflict.left.key); let item = Zotero.Items.getByLibraryAndKey(libraryID, conflict.left.key);
let mtime = io.dataOut[i].dateModified; let mtime = io.dataOut[i].data.dateModified;
// Local // Local
if (mtime == conflict.left.dateModified) { if (mtime == conflict.left.dateModified) {
syncState = this.SYNC_STATE_FORCE_UPLOAD; syncState = this.SYNC_STATE_FORCE_UPLOAD;