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

Generate conflict if number of item creators changed

Browse Source
This commit is contained in:
Dan Stillman 2008-09-05 05:42:59 +00:00
parent f165204b88
commit 49593266e1
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
chrome/content/zotero/xpcom/sync.js
View File

@ -1487,8 +1487,15 @@ Zotero.Sync.Server.Data = new function() {
if (!diff) { if (!diff) {
// Check if creators changed // Check if creators changed
var creatorsChanged = false; var creatorsChanged = false;
var creators = obj.getCreators(); var creators = obj.getCreators();
creators = creators.concat(remoteObj.getCreators()); var remoteCreators = remoteObj.getCreators();
if (creators.length != remoteCreators.length) {
creatorsChanged = true;
}
else {
creators = creators.concat(remoteCreators);
for each(var creator in creators) { for each(var creator in creators) {
var r = remoteCreatorStore[creator.ref.id]; var r = remoteCreatorStore[creator.ref.id];
// Doesn't include dateModified // Doesn't include dateModified
@ -1497,6 +1504,7 @@ Zotero.Sync.Server.Data = new function() {
break; break;
} }
} }
}
if (!creatorsChanged) { if (!creatorsChanged) {
continue; continue;
} }