suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix "Item collection [n] not found" error after deleting collection

Browse Source
This commit is contained in:
Dan Stillman 2017-02-21 00:38:00 -05:00
parent 90603c33b4
commit 60b2e16746
2 changed files with 31 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
chrome/content/zotero/xpcom/data/collection.js
View File

@ -569,6 +569,7 @@ Zotero.Collection.prototype._eraseData = Zotero.Promise.coroutine(function* (env
var items = [];
var del = [];
var itemsToUpdate = [];
for(var i=0, len=descendents.length; i<len; i++) {
// Descendent collections
if (descendents[i].type == 'collection') {
@ -587,6 +588,9 @@ Zotero.Collection.prototype._eraseData = Zotero.Promise.coroutine(function* (env
if (env.options.deleteItems) {
del.push(descendents[i].id);
}
else {
itemsToUpdate.push(descendents[i].id);
}
}
}
if (del.length) {
@ -629,8 +633,16 @@ Zotero.Collection.prototype._eraseData = Zotero.Promise.coroutine(function* (env
yield Zotero.DB.queryAsync ('DELETE FROM collections WHERE collectionID IN '
+ '(' + placeholders + ')', collections);
// TODO: Update member items
env.deletedObjectIDs = collections;
// Update collection cache for descendant items
if (!env.options.deleteItems) {
let deletedCollections = new Set(env.deletedObjectIDs);
itemsToUpdate.forEach(itemID => {
let item = Zotero.Items.get(itemID);
item._collections = item._collections.filter(c => !deletedCollections.has(c));
});
}
});
Zotero.Collection.prototype._finalizeErase = Zotero.Promise.coroutine(function* (env) {

19
test/tests/collectionTest.js
View File

@ -35,7 +35,24 @@ describe("Zotero.Collection", function() {
assert.isTrue((yield Zotero.Items.getAsync(item1.id)).deleted);
assert.isTrue((yield Zotero.Items.getAsync(item2.id)).deleted);
})
});
it("should clear collection from item cache", function* () {
var collection = yield createDataObject('collection');
var item = yield createDataObject('item', { collections: [collection.id] });
assert.lengthOf(item.getCollections(), 1);
yield collection.eraseTx();
assert.lengthOf(item.getCollections(), 0);
});
it("should clear subcollection from descendent item cache", function* () {
var collection = yield createDataObject('collection');
var subcollection = yield createDataObject('collection', { parentID: collection.id });
var item = yield createDataObject('item', { collections: [subcollection.id] });
assert.lengthOf(item.getCollections(), 1);
yield collection.eraseTx();
assert.lengthOf(item.getCollections(), 0);
});
})
describe("#version", function () {