openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

Andreas Preikschat has proposed merging lp:~googol-hush/openlp/songs into lp:openlp.

Requested reviews:
  OpenLP Core (openlp-core)

For more details, see:
https://code.launchpad.net/~googol-hush/openlp/songs/+merge/58933

Hello,

- Make sure that the set all defaults when logging an error.

Yes, set_defaults is called twice when finish() returns False. I was not sure myself if I should remove the set_defaults call when returning False in the finish() method, but finally I decided that the SongIport importer should take care of calling set_default() and not the song importers. (And the SongImport class cannot make sure that song importers logs an error.)
-- 
https://code.launchpad.net/~googol-hush/openlp/songs/+merge/58933
Your team OpenLP Core is requested to review the proposed merge of lp:~googol-hush/openlp/songs into lp:openlp.

=== modified file 'openlp/plugins/songs/lib/songimport.py'
--- openlp/plugins/songs/lib/songimport.py	2011-04-20 17:36:16 +0000
+++ openlp/plugins/songs/lib/songimport.py	2011-04-25 07:44:28 +0000
@@ -110,6 +110,7 @@
             The reason, why the import failed. The string should be as
             informative as possible.
         """
+        self.set_defaults()
         if self.import_wizard is None:
             return
         if self.import_wizard.errorReportTextEdit.isHidden():