From c4563af3818746004ad8b4bc23d6fe7f8cbb3845 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sun, 10 Jul 2022 23:26:07 -0400
Subject: [PATCH] Fix sorting of attachments and notes columns

Regression from a8ed30ce803
---
 chrome/content/zotero/itemTree.jsx | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/chrome/content/zotero/itemTree.jsx b/chrome/content/zotero/itemTree.jsx
index 0e5cb276ef..81092ee81b 100644
--- a/chrome/content/zotero/itemTree.jsx
+++ b/chrome/content/zotero/itemTree.jsx
@@ -1874,11 +1874,17 @@ var ItemTree = class ItemTree extends LibraryTree {
 	}
 	
 	_isValidSortField(field) {
-		return field == 'itemType'
-			|| field == 'year'
-			|| field == 'id' // feeds
-			|| !!Zotero.ItemFields.getID(field)
-			|| Zotero.Items.primaryFields.includes(field);
+		switch (field) {
+			// Non-standard columns
+			case 'itemType':
+			case 'year':
+			case 'hasAttachment':
+			case 'numNotes':
+			// Feed items
+			case 'id':
+				return true;
+		}
+		return !!Zotero.ItemFields.getID(field) || Zotero.Items.primaryFields.includes(field);
 	}
 	
 	/**