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

Fix error deleting collection after emptying trash

Browse Source 
Follow-up to c442daedce
Fixes #1317
This commit is contained in:
Dan Stillman 2017-09-18 17:03:12 -04:00
parent 49506b6d94
commit afc7afeb9c
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -427,7 +427,7 @@ Zotero.Collection.prototype.removeItems = Zotero.Promise.coroutine(function* (it
return; return;
} }
var current = this.getChildItems(true); var current = this.getChildItems(true, true);
Zotero.DB.requireTransaction(); Zotero.DB.requireTransaction();
for (let i=0; i<itemIDs.length; i++) { for (let i=0; i<itemIDs.length; i++) {

8
test/tests/collectionTest.js
View File

@ -251,7 +251,13 @@ describe("Zotero.Collection", function() {
var item = yield createDataObject('item', { collections: [ col.id ] }); var item = yield createDataObject('item', { collections: [ col.id ] });
assert.lengthOf(col.getChildItems(), 1); assert.lengthOf(col.getChildItems(), 1);
yield item.erase(); yield item.erase();
Zotero.debug(col.getChildItems()); assert.lengthOf(col.getChildItems(), 0);
});
it("should not include items emptied from trash", function* () {
var col = yield createDataObject('collection');
var item = yield createDataObject('item', { collections: [ col.id ], deleted: true });
yield item.erase();
assert.lengthOf(col.getChildItems(), 0); assert.lengthOf(col.getChildItems(), 0);
}); });
}) })