From 17d756514c9618d02c7a723776906d5e3a801ad8 Mon Sep 17 00:00:00 2001 From: Chris Hill Date: Fri, 13 Feb 2015 18:49:31 +0000 Subject: [PATCH] fixed bug #1000729 'Support more song fields in the search' - corrected CCLI number sorting' Fixes: https://launchpad.net/bugs/1000729 --- openlp/plugins/songs/lib/mediaitem.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openlp/plugins/songs/lib/mediaitem.py b/openlp/plugins/songs/lib/mediaitem.py index d83034402..4d5846480 100644 --- a/openlp/plugins/songs/lib/mediaitem.py +++ b/openlp/plugins/songs/lib/mediaitem.py @@ -225,7 +225,7 @@ class SongMediaItem(MediaManagerItem): log.debug('CCLI number Search') search_string = '%' + search_keywords + '%' search_results = self.plugin.manager.get_all_objects( - Song, and_(Song.ccli_number.like(search_string), Song.ccli_number != ''), Song.ccli_number.asc()) + Song, and_(Song.ccli_number.like(search_string), Song.ccli_number != '')) self.display_results_cclinumber(search_results) self.check_search_result() @@ -326,6 +326,7 @@ class SongMediaItem(MediaManagerItem): def display_results_cclinumber(self, search_results): log.debug('display results CCLI number') self.list_view.clear() + search_results.sort(key=lambda song: int(song.ccli_number)) for song in search_results: # Do not display temporary songs if song.temporary: