← Back to team overview

openlp-core team mailing list archive

[Merge] lp:~googol-hush/openlp/OpenLyrics into lp:openlp

 

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

Requested reviews:
  OpenLP Core (openlp-core)

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

Hello!

Just a small fix.

- do not add the "entry" attribute to songbooks when there is no song number.
-- 
https://code.launchpad.net/~googol-hush/openlp/OpenLyrics/+merge/49274
Your team OpenLP Core is requested to review the proposed merge of lp:~googol-hush/openlp/OpenLyrics into lp:openlp.
=== modified file 'openlp/plugins/songs/lib/xml.py'
--- openlp/plugins/songs/lib/xml.py	2011-02-10 13:32:31 +0000
+++ openlp/plugins/songs/lib/xml.py	2011-02-10 19:16:55 +0000
@@ -263,7 +263,8 @@
             songbooks = etree.SubElement(properties, u'songbooks')
             element = self._add_text_to_element(
                 u'songbook', songbooks, None, book)
-            element.set(u'entry', song.song_number)
+            if song.song_number:
+                element.set(u'entry', song.song_number)
         if song.topics:
             themes = etree.SubElement(properties, u'themes')
             for topic in song.topics:


Follow ups