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 634d0a50c9
commit b76ce704a3
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1487,14 +1487,22 @@ 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();
for each(var creator in creators) {
var r = remoteCreatorStore[creator.ref.id]; if (creators.length != remoteCreators.length) {
// Doesn't include dateModified creatorsChanged = true;
if (r && !r.equals(creator.ref)) { }
creatorsChanged = true; else {
break; creators = creators.concat(remoteCreators);
for each(var creator in creators) {
var r = remoteCreatorStore[creator.ref.id];
// Doesn't include dateModified
if (r && !r.equals(creator.ref)) {
creatorsChanged = true;
break;
}
} }
} }
if (!creatorsChanged) { if (!creatorsChanged) {