From a0ebf203a6f83861c8f49ae9d2bed715f6d96afe Mon Sep 17 00:00:00 2001 From: Charles Haley Date: Wed, 12 Jan 2022 09:25:15 +0000 Subject: [PATCH 1/2] Bug 1957131: Hierarchical search: "Current search is not a saved search" when getting expression from tag browser --- src/calibre/gui2/tag_browser/view.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/calibre/gui2/tag_browser/view.py b/src/calibre/gui2/tag_browser/view.py index a6585cb0c3..046496dda5 100644 --- a/src/calibre/gui2/tag_browser/view.py +++ b/src/calibre/gui2/tag_browser/view.py @@ -877,7 +877,7 @@ class TagsView(QTreeView): # {{{ search_submenu.addAction(self.search_copy_icon, _('The saved search expression'), partial(self.context_menu_handler, action='raw_search', - key=tag.name)) + key=tag.original_name)) self.context_menu.addSeparator() elif key.startswith('@') and not item.is_gst: if item.can_be_edited: From 06b366fae2f4880f3df1ad6972964fe19935a4cf Mon Sep 17 00:00:00 2001 From: Charles Haley Date: Wed, 12 Jan 2022 09:33:20 +0000 Subject: [PATCH 2/2] Bug 1957122: Search results after updating composite column --- src/calibre/gui2/library/models.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index 35abe84319..354678c511 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -1122,7 +1122,8 @@ class BooksModel(QAbstractTableModel): # {{{ disp['composite_template'] = tmpl self.db.set_custom_column_metadata(cc['colnum'], display=disp, update_last_modified=True) - self.refresh(reset=True) + self.refresh(reset=False) + self.research(reset=True) return True id = self.db.id(row)