Merge lp:~bob-luursema/openlp/bug-1800761 into lp:openlp
Proposed by
Bob Luursema
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Raoul Snyman | ||||
Approved revision: | 2850 | ||||
Merged at revision: | 2847 | ||||
Proposed branch: | lp:~bob-luursema/openlp/bug-1800761 | ||||
Merge into: | lp: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:~bob-luursema/openlp/bug-1800761 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Tomas Groth | Approve | ||
Raoul Snyman | Approve | ||
Review via email: mp+364001@code.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.
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?