Fix tag selector not showing child item tags in "Title, Creator, Year" mode

Regression from 5.0.83. This reverts 4290f26d7c.

https://forums.zotero.org/discussion/82564/tag-management
This commit is contained in:
Dan Stillman 2020-05-03 20:04:58 -04:00
parent 806ba2eb72
commit ac19cbbc40

View file

@ -336,6 +336,7 @@ Zotero.CollectionTreeRow.prototype.getSearchObject = Zotero.Promise.coroutine(fu
// Library root
if (this.isLibrary(true)) {
s.addCondition('noChildren', 'true');
// Allow tag selector to match child items in "Title, Creator, Year" mode
includeScopeChildren = true;
}
else if (this.isCollection()) {
@ -344,6 +345,7 @@ Zotero.CollectionTreeRow.prototype.getSearchObject = Zotero.Promise.coroutine(fu
if (Zotero.Prefs.get('recursiveCollections')) {
s.addCondition('recursive', 'true');
}
// Allow tag selector to match child items in "Title, Creator, Year" mode
includeScopeChildren = true;
}
else if (this.isPublications()) {
@ -364,10 +366,6 @@ Zotero.CollectionTreeRow.prototype.getSearchObject = Zotero.Promise.coroutine(fu
if (this.isTrash()) {
s2.addCondition('deleted', 'true');
}
// Don't search child items in "Title, Creator, Year" mode
if (Zotero.Prefs.get('search.quicksearch-mode') == 'titleCreatorYear') {
includeScopeChildren = false;
}
s2.setScope(s, includeScopeChildren);
if (this.searchText) {