openlp-core team mailing list archive

[phill <phill.ridout@xxxxxxxxxxxxxx>]

phill has proposed merging lp:~phill-ridout/openlp/bug-1011286 into lp:openlp.

Requested reviews:
  Raoul Snyman (raoul-snyman)
  Tim Bentley (trb143)
Related bugs:
  Bug #1011286 in OpenLP: "Song Editor -> Edit All Crashes with out valid verse splitter"
  https://bugs.launchpad.net/openlp/+bug/1011286

For more details, see:
https://code.launchpad.net/~phill-ridout/openlp/bug-1011286/+merge/110651

Removed debug.log statment

Removed input validation on "Edit All" Dialog, as per Raouls comment on my previous merge request

-- 
https://code.launchpad.net/~phill-ridout/openlp/bug-1011286/+merge/110651
Your team OpenLP Core is subscribed to branch lp:openlp.

=== modified file 'openlp/plugins/songs/forms/editverseform.py'
--- openlp/plugins/songs/forms/editverseform.py	2012-04-29 15:31:56 +0000
+++ openlp/plugins/songs/forms/editverseform.py	2012-06-16 08:34:26 +0000
@@ -187,19 +187,9 @@
 
     def accept(self):
         if self.hasSingleVerse:
-            value = unicode(self.getVerse()[0])
-        else:
-            log.debug(unicode(self.getVerse()[0]).split(u'\n'))
-            value = unicode(self.getVerse()[0]).split(u'\n')[1]
-            if not value:
-                lines = unicode(self.getVerse()[0]).split(u'\n')
-                index = 2
-                while index < len(lines) and not value:
-                    value = lines[index]
-                    index += 1
-        if not value:
-            critical_error_message_box(
-                message=translate('SongsPlugin.EditSongForm',
-                'You need to type some text in to the verse.'))
-            return False
+            if not self.getVerse()[0]:
+                critical_error_message_box(
+                    message=translate('SongsPlugin.EditSongForm',
+                    'You need to type some text in to the verse.'))
+                return False
         QtGui.QDialog.accept(self)