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

Fixed filed items with annotations appearing in Unfiled Items

Browse source 
Fixes #2771

Regression from 20c6fe67
This commit is contained in:
Dan Stillman 2022-08-19 00:12:42 -04:00
parent 3391f3bc99
commit b373291c02
2 changed files with 19 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
chrome/content/zotero/xpcom/data/search.js
View file

@ -1082,14 +1082,15 @@ Zotero.Search.prototype._buildQuery = Zotero.Promise.coroutine(function* () {
} }
if (unfiled) { if (unfiled) {
sql += " AND (itemID NOT IN (SELECT itemID FROM collectionItems) " sql += " AND (itemID NOT IN ("
+ "SELECT itemID FROM collectionItems "
// Exclude children // Exclude children
+ "AND itemID NOT IN " + "UNION SELECT itemID FROM itemAttachments WHERE parentItemID IS NOT NULL "
+ "(SELECT itemID FROM itemAttachments WHERE parentItemID IS NOT NULL " + "UNION SELECT itemID FROM itemNotes WHERE parentItemID IS NOT NULL "
+ "UNION SELECT itemID FROM itemNotes WHERE parentItemID IS NOT NULL)" + "UNION SELECT itemID FROM itemAnnotations "
+ ") "
// Exclude My Publications // Exclude My Publications
+ "AND itemID NOT IN (SELECT itemID FROM publicationsItems)"; + "UNION SELECT itemID FROM publicationsItems "
+ "))";
} }
if (retracted) { if (retracted) {

12
test/tests/searchTest.js
View file

@ -170,6 +170,18 @@ describe("Zotero.Search", function() {
assert.sameMembers(matches, [item.id]); assert.sameMembers(matches, [item.id]);
}); });
it("should match child attachment", async function () {
var col = await createDataObject('collection');
var item = await createDataObject('item', { collections: [col.id] });
var attachment = await importPDFAttachment(item);
var s = new Zotero.Search();
s.libraryID = item.libraryID;
s.addCondition('collection', 'is', col.key);
var matches = await s.search();
assert.sameMembers(matches, [item.id, attachment.id]);
});
it("should find items not in collection", function* () { it("should find items not in collection", function* () {
var col = yield createDataObject('collection'); var col = yield createDataObject('collection');
var item = yield createDataObject('item', { collections: [col.id] }); var item = yield createDataObject('item', { collections: [col.id] });