OpenLP

Merge lp://qastaging/~m2j/openlp/bug-969282 into lp://qastaging/openlp

  1. bug-969282
  2. Merge into trunk
Proposed by Meinert Jordan
Status: Merged
Merged at revision: 1932
Proposed branch: lp://qastaging/~m2j/openlp/bug-969282
Merge into: lp://qastaging/openlp
Diff against target: 52 lines (+10/-8)
2 files modified
openlp/plugins/songs/forms/editsongform.py (+7/-7)
openlp/plugins/songs/lib/__init__.py (+3/-1)
To merge this branch: bzr merge lp://qastaging/~m2j/openlp/bug-969282
Reviewer Review Type Date Requested Status
Jonathan Corwin (community) Approve
Raoul Snyman Approve
Tim Bentley Pending
Review via email: mp+100520@code.qastaging.launchpad.net

This proposal supersedes a proposal from 2012-04-02.

Description of the change

Bug #969282: Remove control characters from song copyright string

To post a comment you must log in.
Revision history for this message
Tim Bentley (trb143) wrote : Posted in a previous version of this proposal

Fix looks ok but the setText to Clear are they necessary?

review: Approve
Revision history for this message
Andreas Preikschat (googol-deactivatedaccount) wrote : Posted in a previous version of this proposal

> Fix looks ok but the setText to Clear are they necessary?

Hm... I just proposed for merging. We will end up with a conflict. I changed the lines to:

self.blaFooCombo.setText(self.song.title if self.song.title else u'')

Revision history for this message
Andreas Preikschat (googol-deactivatedaccount) wrote : Posted in a previous version of this proposal

https://code.launchpad.net/~googol/openlp/songs/+merge/100490

Revision history for this message
Raoul Snyman (raoul-snyman) :
review: Approve
Revision history for this message
Jonathan Corwin (j-corwin) :
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.