OpenLP

Merge lp://qastaging/~raoul-snyman/openlp/bug-1557514-2.4 into lp://qastaging/openlp/2.4

  1. bug-1557514-2.4
  2. Merge into 2.4
Proposed by Raoul Snyman
Status: Merged
Approved by: Raoul Snyman
Approved revision: 2625
Merged at revision: 2626
Proposed branch: lp://qastaging/~raoul-snyman/openlp/bug-1557514-2.4
Merge into: lp://qastaging/openlp/2.4
Diff against target: 294 lines (+139/-28)
4 files modified
.bzrignore (+1/-0)
openlp/plugins/songs/lib/db.py (+1/-1)
openlp/plugins/songs/lib/importers/openlp.py (+61/-27)
tests/functional/openlp_plugins/songs/test_openlpimporter.py (+76/-0)
To merge this branch: bzr merge lp://qastaging/~raoul-snyman/openlp/bug-1557514-2.4
Reviewer Review Type Date Requested Status
Tim Bentley Approve
Tomas Groth Approve
Review via email: mp+293160@code.qastaging.launchpad.net

Description of the change

Fix bug #1557514 by auto-detecting the columns of the tables in the songs database

Add this to your merge proposal:
--------------------------------
lp:~raoul-snyman/openlp/bug-1557514-2.4 (revision 2625)
[SUCCESS] https://ci.openlp.io/job/Branch-01-Pull/1502/
[SUCCESS] https://ci.openlp.io/job/Branch-02-Functional-Tests/1413/
[SUCCESS] https://ci.openlp.io/job/Branch-03-Interface-Tests/1351/
[SUCCESS] https://ci.openlp.io/job/Branch-04a-Windows_Functional_Tests/1147/
[SUCCESS] https://ci.openlp.io/job/Branch-04b-Windows_Interface_Tests/738/
[FAILURE] https://ci.openlp.io/job/Branch-05a-Code_Analysis/805/
Stopping after failure

To post a comment you must log in.
Revision history for this message
Tomas Groth (tomasgroth) :
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.

Subscribers

People subscribed via source and target branches

to all changes: