OpenLP

Merge lp://qastaging/~minkus/openlp/searchfields into lp://qastaging/openlp

  1. searchfields
  2. Merge into trunk
Proposed by Chris Hill
Status: Merged
Approved by: Tim Bentley
Approved revision: 2499
Merged at revision: 2626
Proposed branch: lp://qastaging/~minkus/openlp/searchfields
Merge into: lp://qastaging/openlp
Diff against target: 135877 lines (+67900/-67473)
4 files modified
openlp/core/resources.py (+67612/-67467)
openlp/plugins/songs/lib/mediaitem.py (+121/-6)
resources/images/openlp-2.qrc (+3/-0)
tests/functional/openlp_plugins/songs/test_mediaitem.py (+164/-0)
To merge this branch: bzr merge lp://qastaging/~minkus/openlp/searchfields
Reviewer Review Type Date Requested Status
Tim Bentley Approve
Raoul Snyman Approve
Review via email: mp+286740@code.qastaging.launchpad.net

Commit message

Fix for bug #1000729. Adds topic, copyright, CCLI number searching, including natural sort for CCLI number search.

Description of the change

Fix for bug #1000729. Adds topic, copyright, CCLI number searching, including natural sort for CCLI number search, based on the existing 'Author' search.

To post a comment you must log in.
Revision history for this message
Chris Hill (minkus) wrote :

lp:~minkus/openlp/searchfields (revision 2499)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1298/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1220/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1159/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/994/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/585/
[FAILURE] https://ci.openlp.io/job/Branch-05a-Code_Analysis/651/
Stopping after failure

Revision history for this message
Chris Hill (minkus) wrote :

I've removed & recreated the merge proposal (as per Branching_And_Merging_Standards) - please can this now be considered?

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

Hey Chris,

Looks good so far. Browsing through the code, I suddenly thought of something while looking at the topic search: what happens if you have more than one instance of the same song in your list of topics? Are the duplicates filtered out? I don't see anything that might do that.

Revision history for this message
Chris Hill (minkus) wrote :

Heya,

Do you mean if you have two topics assigned to one song, and the topic search returns both instances? It will show both, sorted by topic then title, e.g.

(Search 'Thanking')
Thanking the Father (Song 1)
Thanking the Father (Song 2)
Thanking the Son (Song 1)
Thanking the Son (Song 3)

I thought this was probably the behaviour people would want (like the Author search works).

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

Ah, I wasn't aware the Author search does that.

Revision history for this message
Raoul Snyman (raoul-snyman) wrote :

Just played with this. Works well. The only "gotcha" I saw was searching for a song via the theme when none of your songs are assigned a theme. You get a space and then the song name, but I can't think up a solution to that either, so I'm willing to let that go while we ruminate on it.

review: Approve
Revision history for this message
Tim Bentley (trb143) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.