www

commit 196e45c849445db5ef491e1ed50d2fddb971cbf0
parent 21849525517d999e2a6ac926d979c8c530122722
Author: Dan Stillman <dstillman@zotero.org>
Date:   Fri, 27 Oct 2017 04:07:35 -0400

Fix file conflict resolution after f0770fa84d

merge.xul now returns an object with .data and .selected instead of
returning .data directly

Diffstat:
M
chrome/content/zotero/xpcom/collectionTreeView.js
 | 
1
+
M
chrome/content/zotero/xpcom/storage/storageLocal.js
 | 
3
++-

2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/chrome/content/zotero/xpcom/collectionTreeView.js b/chrome/content/zotero/xpcom/collectionTreeView.js
@@ -2192,6 +2192,7 @@ Zotero.CollectionTreeView.prototype.drop = Zotero.Promise.coroutine(function* (r
 				lastWin.openDialog('chrome://zotero/content/merge.xul', '', 'chrome,modal,centerscreen', io);
 				
 				yield Zotero.DB.executeTransaction(function* () {
+					// DEBUG: This probably needs to be updated if this starts being used
 					for (let obj of io.dataOut) {
 						yield obj.ref.save();
 					}
diff --git a/chrome/content/zotero/xpcom/storage/storageLocal.js b/chrome/content/zotero/xpcom/storage/storageLocal.js
@@ -1026,11 +1026,12 @@ Zotero.Sync.Storage.Local = {
 		if (!io.dataOut) {
 			return false;
 		}
+		
 		yield Zotero.DB.executeTransaction(function* () {
 			for (let i = 0; i < conflicts.length; i++) {
 				let conflict = conflicts[i];
 				let item = Zotero.Items.getByLibraryAndKey(libraryID, conflict.left.key);
-				let mtime = io.dataOut[i].dateModified;
+				let mtime = io.dataOut[i].data.dateModified;
 				// Local
 				if (mtime == conflict.left.dateModified) {
 					syncState = this.SYNC_STATE_FORCE_UPLOAD;