From 5bfdeb36caca562d6825af81d57221d2ed8c8a5f Mon Sep 17 00:00:00 2001 From: Abe Jellinek Date: Fri, 30 Jul 2021 14:15:10 -0600 Subject: [PATCH] Exclude unmergeable types by name, not by ID (#2137) Excluding by ID obscured which types were being excluded. IDs drifted and we ended up blacklisting artwork and encyclopediaArticle. --- chrome/content/zotero/duplicatesMerge.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/content/zotero/duplicatesMerge.js b/chrome/content/zotero/duplicatesMerge.js index 9b764e9235..94c0d38a6b 100644 --- a/chrome/content/zotero/duplicatesMerge.js +++ b/chrome/content/zotero/duplicatesMerge.js @@ -46,7 +46,7 @@ var Zotero_Duplicates_Pane = new function () { otherItems.push(item); } - if (!item.isRegularItem() || [1,14].indexOf(item.itemTypeID) != -1) { + if (!item.isRegularItem() || ['annotation', 'attachment', 'note'].includes(item.itemType)) { var msg = Zotero.getString('pane.item.duplicates.onlyTopLevel'); ZoteroPane_Local.setItemPaneMessage(msg); return false;