openlp-core team mailing list archive

[Andreas Preikschat <andreaspreikschat@xxxxxxxxxx>]

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

Requested reviews:
  OpenLP Core (openlp-core)

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

Hello,

- fixed a wrong parentage which can lead to a traceback when you enter a custom service notes, but the service order does not contain any item.

Details:
1) Each service item has its own div
2) The custom service notes where added as child to the last item's div (which is wrong)
3) If there is not any service item in the order -> traceback
Solution: own div for custom service notes.
-- 
https://code.launchpad.net/~googol-hush/openlp/printServiceOrder/+merge/57695
Your team OpenLP Core is requested to review the proposed merge of lp:~googol-hush/openlp/printServiceOrder into lp:openlp.

=== modified file 'openlp/core/ui/printserviceform.py'
--- openlp/core/ui/printserviceform.py	2011-04-13 18:01:28 +0000
+++ openlp/core/ui/printserviceform.py	2011-04-14 14:54:26 +0000
@@ -222,6 +222,7 @@
                     unicode(datetime.timedelta(seconds=tme)), title)
         # Add the custom service notes:
         if self.footerTextEdit.toPlainText():
+            div = self._addChildToParent(u'div', parent=html_data.body)
             self._addChildToParent(u'span', translate('OpenLP.ServiceManager',
                 u'Custom Service Notes:'), div, u'class', u'customNotesTitle')
             self._addChildToParent(