From e6d4857c819199c83e9c639b4b41feda5bf6a83f Mon Sep 17 00:00:00 2001 From: Johannes Thomas Meyer Date: Sat, 3 Jun 2017 12:44:28 +0200 Subject: [PATCH] added SongBook name, Song Number and Alternative Title to Entire Search Fixes: https://launchpad.net/bugs/1695587 --- openlp/plugins/songs/lib/mediaitem.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index 7c4d128d2..51c1b6539 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -231,9 +231,13 @@ class SongMediaItem(MediaManagerItem): def search_entire(self, search_keywords): search_string = '%{text}%'.format(text=clean_string(search_keywords)) - return self.plugin.manager.get_all_objects( - Song, or_(Song.search_title.like(search_string), Song.search_lyrics.like(search_string), - Song.comments.like(search_string))) + return (self.plugin.manager.session.query(Song) + .join(SongBookEntry, isouter=True) + .join(Book, isouter=True) + .filter(or_(Book.name.like(search_string), SongBookEntry.entry.like(search_string), + Song.search_title.like(search_string), Song.search_lyrics.like(search_string), + Song.comments.like(search_string), Song.alternate_title.like(search_string))) + .all()) def on_song_list_load(self): """