www

commit 46531a4c69f8eef706b6986fb51be7e634b03d97
parent 81d5618346475a723c1e8f489a0c1de8f596a243
Author: Dan Stillman <dstillman@zotero.org>
Date:   Wed, 26 Jul 2017 05:31:39 -0400

Remove non-matching parent items when deleting items from trash

Fixes #866, Trash doesn't refresh properly when emptying deleted
attachments

Diffstat:
M
chrome/content/zotero/xpcom/data/item.js
 | 
4
++++
M
chrome/content/zotero/xpcom/itemTreeView.js
 | 
23
+++++++++++++++--------
M
chrome/content/zotero/xpcom/libraryTreeView.js
 | 
9
+++++++++
M
test/tests/itemTreeViewTest.js
 | 
17
+++++++++++++++++

4 files changed, 45 insertions(+), 8 deletions(-)
diff --git a/chrome/content/zotero/xpcom/data/item.js b/chrome/content/zotero/xpcom/data/item.js
@@ -4017,6 +4017,10 @@ Zotero.Item.prototype._eraseData = Zotero.Promise.coroutine(function* (env) {
 		? (yield this.ObjectsClass.getByLibraryAndKeyAsync(this.libraryID, parentItem))
 		: null;
 	
+	if (parentItem) {
+		Zotero.Notifier.queue('refresh', 'item', parentItem.id);
+	}
+	
 	// // Delete associated attachment files
 	if (this.isAttachment()) {
 		let linkMode = this.getAttachmentLinkMode();
diff --git a/chrome/content/zotero/xpcom/itemTreeView.js b/chrome/content/zotero/xpcom/itemTreeView.js
@@ -593,6 +593,20 @@ Zotero.ItemTreeView.prototype.notify = Zotero.Promise.coroutine(function* (actio
 			this._cellTextCache = {};
 		}
 		
+		// For a refresh on an item in the trash, check if the item still belongs
+		if (type == 'item' && collectionTreeRow.isTrash()) {
+			let rows = [];
+			for (let id of ids) {
+				let row = this.getRowIndexByID(id);
+				if (row === false) continue;
+				let item = Zotero.Items.get(id);
+				if (!item.deleted && !item.numChildren()) {
+					rows.push(row);
+				}
+			}
+			this._removeRows(rows);
+		}
+		
 		return;
 	}
 	
@@ -664,14 +678,7 @@ Zotero.ItemTreeView.prototype.notify = Zotero.Promise.coroutine(function* (actio
 		}
 		
 		if (rows.length > 0) {
-			// Child items might have been added more than once
-			rows = Zotero.Utilities.arrayUnique(rows);
-			rows.sort(function(a,b) { return a-b });
-			
-			for (let i = rows.length - 1; i >= 0; i--) {
-				this._removeRow(rows[i]);
-			}
-			
+			this._removeRows(rows);
 			madeChanges = true;
 		}
 	}
diff --git a/chrome/content/zotero/xpcom/libraryTreeView.js b/chrome/content/zotero/xpcom/libraryTreeView.js
@@ -279,6 +279,15 @@ Zotero.LibraryTreeView.prototype = {
 	},
 	
 	
+	_removeRows: function (rows) {
+		rows = Zotero.Utilities.arrayUnique(rows);
+		rows.sort((a, b) => a - b);
+		for (let i = rows.length - 1; i >= 0; i--) {
+			this._removeRow(rows[i]);
+		}
+	},
+	
+	
 	getLevel: function (row) {
 		return this._rows[row].level;
 	},
diff --git a/test/tests/itemTreeViewTest.js b/test/tests/itemTreeViewTest.js
@@ -530,6 +530,23 @@ describe("Zotero.ItemTreeView", function() {
 			assert.isFalse(zp.itemsView.getRowIndexByID(item.id));
 		});
 		
+		describe("Trash", function () {
+			it("should remove untrashed parent item when last trashed child is deleted", function* () {
+				var userLibraryID = Zotero.Libraries.userLibraryID;
+				var item = yield createDataObject('item');
+				var note = yield createDataObject(
+					'item', { itemType: 'note', parentID: item.id, deleted: true }
+				);
+				yield cv.selectByID("T" + userLibraryID);
+				yield waitForItemsLoad(win);
+				assert.isNumber(zp.itemsView.getRowIndexByID(item.id));
+				var promise = waitForDialog();
+				yield zp.emptyTrash();
+				yield promise;
+				assert.isFalse(zp.itemsView.getRowIndexByID(item.id));
+			});
+		});
+		
 		describe("My Publications", function () {
 			before(function* () {
 				var libraryID = Zotero.Libraries.userLibraryID;