OpenLP

Merge lp://qastaging/~bob-luursema/openlp/bug-1800761 into lp://qastaging/openlp

  1. bug-1800761
  2. Merge into trunk
Proposed by Bob Luursema
Status: Merged
Approved by: Raoul Snyman
Approved revision: 2850
Merged at revision: 2847
Proposed branch: lp://qastaging/~bob-luursema/openlp/bug-1800761
Merge into: lp://qastaging/openlp
Diff against target: 188 lines (+48/-14)
4 files modified
.bzrignore (+1/-0)
openlp/plugins/songs/forms/songselectform.py (+11/-2)
openlp/plugins/songs/lib/songselect.py (+25/-5)
tests/functional/openlp_plugins/songs/test_songselect.py (+11/-7)
To merge this branch: bzr merge lp://qastaging/~bob-luursema/openlp/bug-1800761
Reviewer Review Type Date Requested Status
Tomas Groth Approve
Raoul Snyman Approve
Review via email: mp+364001@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2019-03-05.

Commit message

Fix bug when using SongSelect import with a free account.

Description of the change

This change checks the subscription level of the login that the user has from a piece of JavaScript on the SongSelect page. If it is a free subscription it will display a messagebox informing the user that their searches are limited to songs in the public domain (as that is what a free user can access).

To post a comment you must log in.
Revision history for this message
Bob Luursema (bob-luursema) wrote : Posted in a previous version of this proposal

I didn't yet test whether the import still works for paid users, since I don't have a paid account. Would it be good to add some unit tests for that by mocking the external call and inputting an HTML file via the mock?

Revision history for this message
Raoul Snyman (raoul-snyman) wrote : Posted in a previous version of this proposal

Linux tests passed!

Revision history for this message
Raoul Snyman (raoul-snyman) wrote : Posted in a previous version of this proposal

Linting failed, please see https://ci.openlp.io/job/MP-03-Linting/42/ for more details

Revision history for this message
Raoul Snyman (raoul-snyman) wrote : Posted in a previous version of this proposal

This looks great! One small change that I think you should make (inline in the diff), and then I think we're good to go!

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

Linux tests passed!

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

Linting passed!

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

macOS tests passed!

Revision history for this message
Raoul Snyman (raoul-snyman) :
review: Approve
Revision history for this message
Tomas Groth (tomasgroth) :
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.