mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Duplicate detection fixes:

Browse source 
- Fix saving of fields from other versions of an item
- Relations (e.g., cross-library links) were merged incorrectly
This commit is contained in:
Dan Stillman 2011-08-29 19:33:52 +00:00
parent 236901c1ad
commit 211da93be4
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
chrome/content/zotero/duplicatesMerge.js
View file

@ -147,10 +147,6 @@ var Zotero_Duplicates_Pane = new function () {
this.merge = function () { this.merge = function () {
var itembox = document.getElementById('zotero-duplicates-merge-item-box'); var itembox = document.getElementById('zotero-duplicates-merge-item-box');
// Work around item.clone() weirdness -- the cloned item can't safely be Zotero.Items.merge(itembox.item, _otherItems);
// used after it's saved, because it's not the version in memory and
// doesn't get reloaded properly in item.save()
var item = Zotero.Items.get(itembox.item.id);
Zotero.Items.merge(item, _otherItems);
} }
} }

7
chrome/content/zotero/xpcom/data/items.js
View file

@ -413,13 +413,12 @@ Zotero.Items = new function() {
for each(var relatedItemID in relatedItems) { for each(var relatedItemID in relatedItems) {
item.addRelatedItem(relatedItemID); item.addRelatedItem(relatedItemID);
} }
item.save();
// Relations // Relations
Zotero.Relations.copyURIs( Zotero.Relations.copyURIs(
item.libraryID, item.libraryID,
Zotero.URI.getItemURI(item), Zotero.URI.getItemURI(otherItem),
Zotero.URI.getItemURI(otherItem) Zotero.URI.getItemURI(item)
); );
// Add relation to track merge // Add relation to track merge
@ -431,6 +430,8 @@ Zotero.Items = new function() {
otherItem.save(); otherItem.save();
} }
item.save();
Zotero.DB.commitTransaction(); Zotero.DB.commitTransaction();
} }