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

Don't show items with annotated attachments after moving to trash

Browse source 
https://forums.zotero.org/discussion/100775/deleted-items-keep-reappearing-in-my-library

Regression from 20c6fe67
This commit is contained in:
Dan Stillman 2022-11-28 04:30:22 -05:00
parent deb5d1cd27
commit f33cf1cde3
2 changed files with 46 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1097,16 +1097,24 @@ Zotero.Search.prototype._buildQuery = Zotero.Promise.coroutine(function* () {
// Exclude deleted items (and their child items) by default // Exclude deleted items (and their child items) by default
let not = deleted ? "" : "NOT "; let not = deleted ? "" : "NOT ";
let op = deleted ? "OR" : "AND"; sql += ` WHERE (itemID ${not} IN (`
sql += " WHERE (" // Deleted items
+ `itemID ${not} IN (SELECT itemID FROM deletedItems) ` + "SELECT itemID FROM deletedItems "
+ `${op} itemID ${not}IN (SELECT itemID FROM itemNotes ` // Child notes of deleted items
+ "UNION SELECT itemID FROM itemNotes "
+ "WHERE parentItemID IS NOT NULL AND " + "WHERE parentItemID IS NOT NULL AND "
+ "parentItemID IN (SELECT itemID FROM deletedItems)) " + "parentItemID IN (SELECT itemID FROM deletedItems) "
+ `${op} itemID ${not}IN (SELECT itemID FROM itemAttachments ` // Child attachments of deleted items
+ "UNION SELECT itemID FROM itemAttachments "
+ "WHERE parentItemID IS NOT NULL AND " + "WHERE parentItemID IS NOT NULL AND "
+ "parentItemID IN (SELECT itemID FROM deletedItems))" + "parentItemID IN (SELECT itemID FROM deletedItems)"
+ ")"; // Annotations of deleted attachments
+ "UNION SELECT itemID FROM itemAnnotations "
+ "WHERE parentItemID IN (SELECT itemID FROM deletedItems)"
// Annotations of attachments of deleted items
+ "UNION SELECT itemID FROM itemAnnotations "
+ "WHERE parentItemID IN (SELECT itemID FROM itemAttachments WHERE parentItemID IN (SELECT itemID FROM deletedItems))"
+ "))";
if (noChildren){ if (noChildren){
sql += " AND (itemID NOT IN (SELECT itemID FROM itemNotes " sql += " AND (itemID NOT IN (SELECT itemID FROM itemNotes "

30
test/tests/searchTest.js
View file

@ -610,6 +610,36 @@ describe("Zotero.Search", function() {
}); });
}); });
}); });
describe("deleted", function () {
describe("if not present", function () {
it("should not match regular items in trash with annotated child attachments", async function () {
var item = await createDataObject('item');
item.deleted = true;
await item.saveTx();
var attachment = await importPDFAttachment(item);
await createAnnotation('highlight', attachment);
var s = new Zotero.Search();
s.libraryID = userLibraryID;
var matches = await s.search();
assert.notInclude(matches, attachment.id);
});
it("should not match regular items with annotated child attachments in trash", async function () {
var item = await createDataObject('item');
var attachment = await importPDFAttachment(item);
attachment.deleted = true;
await attachment.saveTx();
await createAnnotation('highlight', attachment);
var s = new Zotero.Search();
s.libraryID = userLibraryID;
var matches = await s.search();
assert.notInclude(matches, attachment.id);
});
});
});
}); });
}); });