Merge lp://qastaging/~gabriel-loo/openlp/songselectimportfix into lp://qastaging/openlp
Proposed by
Gabriel Loo
| Status: | Merged |
|---|---|
| Approved by: | Tim Bentley |
| Approved revision: | 2642 |
| Merged at revision: | 2646 |
| Proposed branch: | lp://qastaging/~gabriel-loo/openlp/songselectimportfix |
| Merge into: | lp://qastaging/openlp |
| Diff against target: |
68 lines (+38/-1) 2 files modified
openlp/plugins/songs/forms/songselectform.py (+2/-0) tests/functional/openlp_plugins/songs/test_songselect.py (+36/-1) |
| To merge this branch: | bzr merge lp://qastaging/~gabriel-loo/openlp/songselectimportfix |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Tim Bentley | Approve | ||
| Raoul Snyman | Approve | ||
| Gabriel Loo (community) | Needs Resubmitting | ||
|
Review via email:
|
|||
Description of the change
Disable the search box while a search is being performed and re-enable it after search is done or the Stop button is pressed. This way it behaves like the Search button and prevents the user from submitting multiple searches while another is ongoing (this is what caused the segfault).
To post a comment you must log in.
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
Hi Gabriel, thanks for your fix!
As per our merge policy, you need to add at least 1 unit test before we will merge your fix. You can read up on unit tests on our wiki:
http://
In addition to that, you need to run the code through Jenkins and present the output. If either the functional or the interface tests break, you need to fix them before continuing.
http://