scriptoriumadmin/zotero
1
0
Fork 0
mirror of https://github.com/zotero/zotero.git synced 2026-09-17 23:51:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Exclude unmergeable types by name, not by ID (#2137)

Browse source 
Excluding by ID obscured which types were being excluded. IDs drifted
and we ended up blacklisting artwork and encyclopediaArticle.
This commit is contained in:
Abe Jellinek 2021-07-30 14:15:10 -06:00 • committed by GitHub
parent 0e2073b251
commit 5bfdeb36ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -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;